forked from mirrors/bookwyrm
code style
This commit is contained in:
parent
12810d8e34
commit
b273123708
5 changed files with 15 additions and 9 deletions
|
@ -192,6 +192,7 @@ let StatusCache = new class {
|
|||
.forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", false));
|
||||
|
||||
// Remove existing disabled states
|
||||
// BUG: this affects all shelves, not just shelving status shelves
|
||||
button.querySelectorAll("[data-shelf-dropdown-identifier] button")
|
||||
.forEach(item => item.disabled = false);
|
||||
|
||||
|
|
|
@ -77,7 +77,11 @@ def related_status(notification):
|
|||
def active_shelf(context, book):
|
||||
"""check what shelf a user has a book on, if any"""
|
||||
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}
|
||||
|
||||
shelf = (
|
||||
|
|
|
@ -95,13 +95,14 @@ class ReadingStatus(View):
|
|||
# unshelve the existing shelf
|
||||
this_shelf = request.POST.get("shelf")
|
||||
if (
|
||||
bool(current_status_shelfbook) and
|
||||
int(this_shelf) != int(current_status_shelfbook.shelf.id) and
|
||||
current_status_shelfbook.shelf.identifier != desired_shelf.identifier
|
||||
bool(current_status_shelfbook)
|
||||
and int(this_shelf) != int(current_status_shelfbook.shelf.id)
|
||||
and current_status_shelfbook.shelf.identifier
|
||||
!= desired_shelf.identifier
|
||||
):
|
||||
return unshelve(request, referer=referer, book_id=book_id)
|
||||
# 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):
|
||||
return HttpResponse()
|
||||
|
|
|
@ -102,5 +102,5 @@ def unshelve(request, referer=None, book_id=False):
|
|||
shelf_book.raise_not_deletable(request.user)
|
||||
shelf_book.delete()
|
||||
if bool(referer):
|
||||
return HttpResponse(headers={"forceReload" : "true"})
|
||||
return HttpResponse(headers={"forceReload": "true"})
|
||||
return redirect(request.headers.get("Referer", "/"))
|
||||
|
|
|
@ -126,7 +126,7 @@ class CreateStatus(View):
|
|||
|
||||
# force page reload if this was triggered from 'move' button
|
||||
if bool(request.POST.get("shelf")):
|
||||
return HttpResponse(headers={"forceReload" : "true"})
|
||||
return HttpResponse(headers={"forceReload": "true"})
|
||||
|
||||
if is_api_request(request):
|
||||
return HttpResponse()
|
||||
|
|
Loading…
Reference in a new issue