1
0
Fork 0

Merge branch 'bookwyrm-social:main' into url-names

This commit is contained in:
Vivianne 2022-03-11 19:55:06 -08:00 committed by GitHub
commit 9fa8caba45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 3956 additions and 3031 deletions

View file

@ -58,8 +58,12 @@ class Editions(View):
)
paginated = Paginator(editions, PAGE_LENGTH)
page = paginated.get_page(request.GET.get("page"))
data = {
"editions": paginated.get_page(request.GET.get("page")),
"editions": page,
"page_range": paginated.get_elided_page_range(
page.number, on_each_side=2, on_ends=1
),
"work": work,
"languages": languages,
"formats": set(

View file

@ -85,9 +85,7 @@ class CreateStatus(View):
if hasattr(status, "quote"):
status.raw_quote = status.quote
if not status.sensitive and status.content_warning:
# the cw text field remains populated when you click "remove"
status.content_warning = None
status.sensitive = status.content_warning not in [None, ""]
status.save(broadcast=False)
# inspect the text for user tags