mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-26 01:50:34 +00:00
Code Issues Projects Releases Wiki Activity

code style

Browse source
This commit is contained in:
Hugh Rundle 2021-11-20 16:06:16 +11:00
parent 12810d8e34
commit b273123708
No known key found for this signature in database
GPG key ID: CD23D6039184286B
5 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bookwyrm/static/js/status_cache.js
View file

@ -192,6 +192,7 @@ let StatusCache = new class {
.forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", false)); .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", false));
// Remove existing disabled states // Remove existing disabled states
// BUG: this affects all shelves, not just shelving status shelves
button.querySelectorAll("[data-shelf-dropdown-identifier] button") button.querySelectorAll("[data-shelf-dropdown-identifier] button")
.forEach(item => item.disabled = false); .forEach(item => item.disabled = false);

6
bookwyrm/templatetags/bookwyrm_tags.py
View file

@ -77,7 +77,11 @@ def related_status(notification):
def active_shelf(context, book): def active_shelf(context, book):
"""check what shelf a user has a book on, if any""" """check what shelf a user has a book on, if any"""
if hasattr(book, "current_shelves"): if hasattr(book, "current_shelves"):
read_shelves = [s for s in book.current_shelves if s.shelf.identifier in models.Shelf.READ_STATUS_IDENTIFIERS] read_shelves = [
s
for s in book.current_shelves
if s.shelf.identifier in models.Shelf.READ_STATUS_IDENTIFIERS
]
return read_shelves[0] if len(read_shelves) else {"book": book} return read_shelves[0] if len(read_shelves) else {"book": book}
shelf = ( shelf = (

13
bookwyrm/views/reading.py
View file

@ -91,17 +91,18 @@ class ReadingStatus(View):
handle_reading_status(request.user, desired_shelf, book, privacy) handle_reading_status(request.user, desired_shelf, book, privacy)
# if the request includes a "shelf" value we are using the 'move' button # if the request includes a "shelf" value we are using the 'move' button
if bool(request.POST.get("shelf")): if bool(request.POST.get("shelf")):
# unshelve the existing shelf # unshelve the existing shelf
this_shelf = request.POST.get("shelf") this_shelf = request.POST.get("shelf")
if ( if (
bool(current_status_shelfbook) and bool(current_status_shelfbook)
int(this_shelf) != int(current_status_shelfbook.shelf.id) and and int(this_shelf) != int(current_status_shelfbook.shelf.id)
current_status_shelfbook.shelf.identifier != desired_shelf.identifier and current_status_shelfbook.shelf.identifier
): != desired_shelf.identifier
):
return unshelve(request, referer=referer, book_id=book_id) return unshelve(request, referer=referer, book_id=book_id)
# don't try to unshelve a read status shelf: it has already been deleted. # don't try to unshelve a read status shelf: it has already been deleted.
return HttpResponse(headers={"forceReload" : "true"}) return HttpResponse(headers={"forceReload": "true"})
if is_api_request(request): if is_api_request(request):
return HttpResponse() return HttpResponse()

2
bookwyrm/views/shelf/shelf_actions.py
View file

@ -102,5 +102,5 @@ def unshelve(request, referer=None, book_id=False):
shelf_book.raise_not_deletable(request.user) shelf_book.raise_not_deletable(request.user)
shelf_book.delete() shelf_book.delete()
if bool(referer): if bool(referer):
return HttpResponse(headers={"forceReload" : "true"}) return HttpResponse(headers={"forceReload": "true"})
return redirect(request.headers.get("Referer", "/")) return redirect(request.headers.get("Referer", "/"))

2
bookwyrm/views/status.py
View file

@ -126,7 +126,7 @@ class CreateStatus(View):
# force page reload if this was triggered from 'move' button # force page reload if this was triggered from 'move' button
if bool(request.POST.get("shelf")): if bool(request.POST.get("shelf")):
return HttpResponse(headers={"forceReload" : "true"}) return HttpResponse(headers={"forceReload": "true"})
if is_api_request(request): if is_api_request(request):
return HttpResponse() return HttpResponse()