Merge branch 'main' into suggestions-redis

2021-08-02 16:40:57 -07:00
parent beb42b17f1 dca7057745
commit fc8db58cdb
59 changed files with 4207 additions and 1252 deletions
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@ -32,8 +32,12 @@ class Directory(View):

        paginated = Paginator(users, 12)

+        page = paginated.get_page(request.GET.get("page"))
        data = {
-            "users": paginated.get_page(request.GET.get("page")),
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
+            "users": page,
        }
        return TemplateResponse(request, "directory/directory.html", data)