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

check shelf.editable instead of custom filter

Browse source
This commit is contained in:
Hugh Rundle 2021-11-16 19:26:49 +11:00
parent eab2ec0ffd
commit ec39346e67
No known key found for this signature in database
GPG key ID: CD23D6039184286B
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bookwyrm/templates/book/book.html
View file

@ -161,12 +161,12 @@
{% for shelf in user_shelfbooks %} {% for shelf in user_shelfbooks %}
<li class="box"> <li class="box">
{% blocktrans with path=shelf.shelf.local_path shelf_name=shelf.shelf.name %}<a href="{{ path }}">{{ shelf_name }}</a>{% endblocktrans %} {% blocktrans with path=shelf.shelf.local_path shelf_name=shelf.shelf.name %}<a href="{{ path }}">{{ shelf_name }}</a>{% endblocktrans %}
{% if shelf.shelf.identifier|is_shelf_type:"readthrough" %} {% if shelf.shelf.editable %}
{% include 'snippets/shelve_button/shelve_button.html' %} <div class="mb-3">
{% include 'snippets/shelf_selector.html' with current=shelf.shelf class="is-small" %}
</div>
{% else %} {% else %}
<div class="mb-3"> {% include 'snippets/shelve_button/shelve_button.html' %}
{% include 'snippets/shelf_selector.html' with current=shelf.shelf class="is-small" %}
</div>
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}

2
bookwyrm/templates/snippets/shelf_selector.html
View file

@ -9,7 +9,7 @@
{% block dropdown-list %} {% block dropdown-list %}
{% for shelf in user_shelves %} {% for shelf in user_shelves %}
{% if shelf.identifier|is_shelf_type:"custom" %} {% if shelf.editable %}
<li role="menuitem" class="dropdown-item p-0"> <li role="menuitem" class="dropdown-item p-0">
<form name="shelve" action="/shelve/" method="post"> <form name="shelve" action="/shelve/" method="post">
{% csrf_token %} {% csrf_token %}

11
bookwyrm/templatetags/bookwyrm_tags.py
View file

@ -41,17 +41,6 @@ def get_book_description(book):
return book.description or book.parent_work.description return book.description or book.parent_work.description
@register.filter(name="is_shelf_type")
def is_shelf_type(current_shelf, shelf_type):
"""is this shelf a readthrough shelf?"""
readthrough = current_shelf in ["to-read", "reading", "read"]
if shelf_type == "readthrough" and bool(readthrough):
return True
if shelf_type == "custom" and not readthrough:
return True
return False
@register.filter(name="next_shelf") @register.filter(name="next_shelf")
def get_next_shelf(current_shelf): def get_next_shelf(current_shelf):
"""shelf you'd use to update reading progress""" """shelf you'd use to update reading progress"""