moved language selection back, default value for restriction columns

Merge branch 'master' into Develop

# Conflicts:
#	cps/editbooks.py
This commit is contained in:
Ozzieisaacs
2020-01-05 16:20:36 +01:00
8 changed files with 110 additions and 45 deletions
+6
View File
@@ -185,6 +185,8 @@ def update_view_configuration():
config.config_default_show = sum(int(k[5:]) for k in to_save if k.startswith('show_'))
'''if "Show_mature_content" in to_save:
config.config_default_show |= constants.MATURE_CONTENT'''
if "Show_detail_random" in to_save:
config.config_default_show |= constants.DETAIL_RANDOM
config.save()
flash(_(u"Calibre-Web configuration updated"), category="success")
@@ -470,6 +472,10 @@ def _configuration_update_helper():
_config_int("config_updatechannel")
# Reverse proxy login configuration
_config_checkbox("config_allow_reverse_proxy_header_login")
_config_string("config_reverse_proxy_login_header_name")
# GitHub OAuth configuration
if config.config_login_type == constants.LOGIN_OAUTH:
active_oauths = 0