mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-13 19:56:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into production

Browse source
This commit is contained in:
Mouse Reeve 2021-01-30 12:31:34 -08:00
commit 9c5444ad7a
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bookwyrm/templates/shelf.html → bookwyrm/templates/user/shelf.html
View file

@ -1,9 +1,8 @@
{% extends 'layout.html' %} {% extends 'user/user_layout.html' %}
{% load bookwyrm_tags %} {% load bookwyrm_tags %}
{% block content %}
<div class="columns"> {% block header %}
<div class="column"> <header class="columns">
<h1 class="title"> <h1 class="title">
{% if is_self %}Your {% if is_self %}Your
{% else %} {% else %}
@ -11,11 +10,10 @@
{% endif %} {% endif %}
shelves shelves
</h1> </h1>
</div> </header>
</div> {% endblock %}
{% include 'snippets/user_header.html' with user=user %}
{% block panel %}
<div class="block columns"> <div class="block columns">
<div class="column"> <div class="column">
<div class="tabs" role="tablist"> <div class="tabs" role="tablist">

2
bookwyrm/tests/views/test_shelf.py
View file

@ -41,7 +41,7 @@ class ShelfViews(TestCase):
is_api.return_value = False is_api.return_value = False
result = view(request, self.local_user.username, shelf.identifier) result = view(request, self.local_user.username, shelf.identifier)
self.assertIsInstance(result, TemplateResponse) self.assertIsInstance(result, TemplateResponse)
self.assertEqual(result.template_name, 'shelf.html') self.assertEqual(result.template_name, 'user/shelf.html')
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
with patch('bookwyrm.views.shelf.is_api_request') as is_api: with patch('bookwyrm.views.shelf.is_api_request') as is_api:

2
bookwyrm/views/shelf.py
View file

@ -62,7 +62,7 @@ class Shelf(View):
'books': [b.book for b in books], 'books': [b.book for b in books],
} }
return TemplateResponse(request, 'shelf.html', data) return TemplateResponse(request, 'user/shelf.html', data)
@method_decorator(login_required, name='dispatch') @method_decorator(login_required, name='dispatch')
# pylint: disable=unused-argument # pylint: disable=unused-argument