rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Merge branch 'main' into production

Browse source
This commit is contained in:
Mouse Reeve 2021-04-15 11:35:30 -07:00
parent 5f783e4fd1 a95ad46cae
commit 37c5c4979f
12 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/management/commands/populate_streams.py
View file

@ -20,7 +20,7 @@ def populate_streams():
)
for user in users:
for stream in activitystreams.streams.values():
stream.populate_stream(user)
stream.populate_streams(user)
class Command(BaseCommand):

2
bookwyrm/models/activitypub_mixin.py
View file

@ -524,7 +524,7 @@ def to_ordered_collection_page(
""" serialize and pagiante a queryset """
paginated = Paginator(queryset, PAGE_LENGTH)
activity_page = paginated.page(page)
activity_page = paginated.get_page(page)
if id_only:
items = [s.remote_id for s in activity_page.object_list]
else:

2
bookwyrm/templates/lists/lists.html
View file

@ -15,10 +15,12 @@
{% endif %}
</h1>
</div>
{% if request.user.is_authenticated %}
<div class="column is-narrow">
{% trans "Create List" as button_text %}
{% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text focus="create-list-header" %}
</div>
{% endif %}
</header>
<div class="block">

4
bookwyrm/views/books.py
View file

@ -60,7 +60,7 @@ class Book(View):
paginated = Paginator(
reviews.exclude(Q(content__isnull=True) | Q(content="")), PAGE_LENGTH
)
reviews_page = paginated.page(page)
reviews_page = paginated.get_page(page)
user_tags = readthroughs = user_shelves = other_edition_shelves = []
if request.user.is_authenticated:
@ -285,7 +285,7 @@ class Editions(View):
paginated = Paginator(editions.filter(**filters).all(), PAGE_LENGTH)
data = {
"editions": paginated.page(page),
"editions": paginated.get_page(page),
"work": work,
"languages": languages,
"formats": set(

2
bookwyrm/views/directory.py
View file

@ -39,7 +39,7 @@ class Directory(View):
paginated = Paginator(users, 12)
data = {
"users": paginated.page(page),
"users": paginated.get_page(page),
}
return TemplateResponse(request, "directory/directory.html", data)

2
bookwyrm/views/federation.py
View file

@ -40,7 +40,7 @@ class Federation(View):
paginated = Paginator(servers, PAGE_LENGTH)
data = {
"servers": paginated.page(page),
"servers": paginated.get_page(page),
"sort": sort,
"form": forms.ServerForm(),
}

4
bookwyrm/views/feed.py
View file

@ -39,7 +39,7 @@ class Feed(View):
**feed_page_data(request.user),
**{
"user": request.user,
"activities": paginated.page(page),
"activities": paginated.get_page(page),
"suggested_users": suggested_users,
"tab": tab,
"goal_form": forms.GoalForm(),
@ -82,7 +82,7 @@ class DirectMessage(View):
).order_by("-published_date")
paginated = Paginator(activities, PAGE_LENGTH)
activity_page = paginated.page(page)
activity_page = paginated.get_page(page)
data = {
**feed_page_data(request.user),
**{

4
bookwyrm/views/invite.py
View file

@ -43,7 +43,7 @@ class ManageInvites(View):
)
data = {
"invites": paginated.page(page),
"invites": paginated.get_page(page),
"form": forms.CreateInviteForm(),
}
return TemplateResponse(request, "settings/manage_invites.html", data)
@ -136,7 +136,7 @@ class ManageInviteRequests(View):
data = {
"ignored": ignored,
"count": paginated.count,
"requests": paginated.page(page),
"requests": paginated.get_page(page),
"sort": sort,
}
return TemplateResponse(request, "settings/manage_invite_requests.html", data)

4
bookwyrm/views/list.py
View file

@ -44,7 +44,7 @@ class Lists(View):
paginated = Paginator(lists, 12)
data = {
"lists": paginated.page(page),
"lists": paginated.get_page(page),
"list_form": forms.ListForm(),
"path": "/list",
}
@ -79,7 +79,7 @@ class UserLists(View):
data = {
"user": user,
"is_self": request.user.id == user.id,
"lists": paginated.page(page),
"lists": paginated.get_page(page),
"list_form": forms.ListForm(),
"path": user.local_path + "/lists",
}

2
bookwyrm/views/shelf.py
View file

@ -70,7 +70,7 @@ class Shelf(View):
"is_self": is_self,
"shelves": shelves.all(),
"shelf": shelf,
"books": paginated.page(page),
"books": paginated.get_page(page),
}
return TemplateResponse(request, "user/shelf.html", data)

2
bookwyrm/views/user.py
View file

@ -87,7 +87,7 @@ class User(View):
"is_self": is_self,
"shelves": shelf_preview,
"shelf_count": shelves.count(),
"activities": paginated.page(page),
"activities": paginated.get_page(page),
"goal": goal,
}

2
bookwyrm/views/user_admin.py
View file

@ -46,5 +46,5 @@ class UserAdmin(View):
users = users.order_by(sort)
paginated = Paginator(users, PAGE_LENGTH)
data = {"users": paginated.page(page), "sort": sort, "server": server}
data = {"users": paginated.get_page(page), "sort": sort, "server": server}
return TemplateResponse(request, "settings/user_admin.html", data)