mirror of
https://github.com/janeczku/calibre-web.git
synced 2024-11-26 08:51:05 +02:00
Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
This commit is contained in:
parent
9128615f48
commit
e8ce88095e
@ -25,7 +25,7 @@ import signal
|
||||
import web
|
||||
|
||||
try:
|
||||
from gevent.piwsgi import WSGIServer
|
||||
from gevent.pywsgi import WSGIServer
|
||||
from gevent.pool import Pool
|
||||
from gevent import __version__ as geventVersion
|
||||
gevent_present = True
|
||||
|
@ -16,7 +16,7 @@
|
||||
{% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
|
||||
{% if g.user and g.user.role_admin() and g.allow_registration and not new_user and not profile %}
|
||||
<div class="btn btn-default" id="resend_password"><a href="{{url_for('reset_password', user_id = content.id) }}">{{_('Reset user Password')}}</a></div>
|
||||
{% else %}
|
||||
{% else %}
|
||||
<div class="form-group">
|
||||
<label for="password">{{_('Password')}}</label>
|
||||
<input type="password" class="form-control" name="password" id="password" value="" autocomplete="off">
|
||||
@ -85,10 +85,12 @@
|
||||
<input type="checkbox" name="show_publisher" id="show_publisher" {% if content.show_publisher() %}checked{% endif %}>
|
||||
<label for="show_publisher">{{_('Show publisher selection')}}</label>
|
||||
</div>
|
||||
{% if not content.role_anonymous() %}
|
||||
<div class="form-group">
|
||||
<input type="checkbox" name="show_read_and_unread" id="show_read_and_unread" {% if content.show_read_and_unread() %}checked{% endif %}>
|
||||
<label for="show_read_and_unread">{{_('Show read and unread')}}</label>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="form-group">
|
||||
<input type="checkbox" name="show_detail_random" id="show_detail_random" {% if content.show_detail_random() %}checked{% endif %}>
|
||||
<label for="show_detail_random">{{_('Show random books in detail view')}}</label>
|
||||
|
@ -3280,6 +3280,11 @@ def edit_user(user_id):
|
||||
elif "show_sorted" not in to_save and content.show_sorted():
|
||||
content.sidebar_view -= ub.SIDEBAR_SORTED
|
||||
|
||||
if "show_publisher" in to_save and not content.show_publisher():
|
||||
content.sidebar_view += ub.SIDEBAR_PUBLISHER
|
||||
elif "show_publisher" not in to_save and content.show_publisher():
|
||||
content.sidebar_view -= ub.SIDEBAR_PUBLISHER
|
||||
|
||||
if "show_hot" in to_save and not content.show_hot_books():
|
||||
content.sidebar_view += ub.SIDEBAR_HOT
|
||||
elif "show_hot" not in to_save and content.show_hot_books():
|
||||
|
Loading…
Reference in New Issue
Block a user