From b22d1863c965db115d35580ceb2f5752cd6d21cb Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 20 Apr 2021 12:31:45 -0700 Subject: [PATCH 1/4] More robust user page test and bug fix --- bookwyrm/tests/views/test_user.py | 8 ++++++++ bookwyrm/views/books.py | 4 ++-- bookwyrm/views/user.py | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 055edae2..7518b2bf 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -30,6 +30,14 @@ class UserViews(TestCase): self.rat = models.User.objects.create_user( "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" ) + self.book = models.Edition.objects.create(title="test") + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + models.ShelfBook.objects.create( + book=self.book, + user=self.local_user, + shelf=self.local_user.shelf_set.first(), + ) + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py index 2a47c0d2..0c61d1a2 100644 --- a/bookwyrm/views/books.py +++ b/bookwyrm/views/books.py @@ -270,10 +270,10 @@ class Editions(View): if request.GET.get("format"): filters["physical_format__iexact"] = request.GET.get("format") - editions = work.editions.order_by("-edition_rank").all() + editions = work.editions.order_by("-edition_rank") languages = set(sum([e.languages for e in editions], [])) - paginated = Paginator(editions.filter(**filters).all(), PAGE_LENGTH) + paginated = Paginator(editions.filter(**filters), PAGE_LENGTH) data = { "editions": paginated.get_page(request.GET.get("page")), "work": work, diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index 9c79a77c..02db5971 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -59,7 +59,7 @@ class User(View): { "name": user_shelf.name, "local_path": user_shelf.local_path, - "books": user_shelf.books[:3], + "books": user_shelf.books.all()[:3], "size": user_shelf.books.count(), } ) From d47bbde651d8b3d7e7250f67dfb76bbf809e2b1d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 20 Apr 2021 13:02:43 -0700 Subject: [PATCH 2/4] Only one row of footer on list items --- bookwyrm/templates/lists/list.html | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 2f0e7d67..a9f8e5c0 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -30,26 +30,32 @@ {% include 'snippets/shelve_button/shelve_button.html' with book=item.book %} -
+
+

{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by {{ username }}{% endblocktrans %}

+
{% if list.user == request.user or list.curation == 'open' and item.user == request.user %} +
+
+
+ {% csrf_token %} +
+ +
+
+ +
+
+ +
+
{% csrf_token %}
-
-
-
-
- {% csrf_token %} - - - -
-
{% endif %}
From 7012f95d6d5623c60b4355869c8774825722a99f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 20 Apr 2021 13:07:55 -0700 Subject: [PATCH 3/4] Use input instead of textarea for series --- bookwyrm/templates/book/edit_book.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html index af5d4d69..1702cf5d 100644 --- a/bookwyrm/templates/book/edit_book.html +++ b/bookwyrm/templates/book/edit_book.html @@ -109,7 +109,10 @@

{{ error | escape }}

{% endfor %} -

{{ form.series }}

+

+ + +

{% for error in form.series.errors %}

{{ error | escape }}

{% endfor %} From c07dcb54580738599833986140c8cea1310504de Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 20 Apr 2021 13:38:25 -0700 Subject: [PATCH 4/4] Remove spaceless templatetags that cause rendering issues in statuses --- bookwyrm/templates/snippets/status/status_content.html | 3 --- bookwyrm/templates/snippets/trimmed_text.html | 2 -- 2 files changed, 5 deletions(-) diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html index 402c4aab..fd3c7ee7 100644 --- a/bookwyrm/templates/snippets/status/status_content.html +++ b/bookwyrm/templates/snippets/status/status_content.html @@ -1,5 +1,3 @@ -{% spaceless %} - {% load bookwyrm_tags %} {% load i18n %} @@ -134,4 +132,3 @@ {% endif %} {% endif %} {% endwith %} -{% endspaceless %} diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html index e1728b8f..6a3fa007 100644 --- a/bookwyrm/templates/snippets/trimmed_text.html +++ b/bookwyrm/templates/snippets/trimmed_text.html @@ -1,4 +1,3 @@ -{% spaceless %} {% load bookwyrm_tags %} {% load i18n %} @@ -46,4 +45,3 @@ {% endwith %} {% endif %} {% endwith %} -{% endspaceless %}