Merge branch 'master' into Develop
# Conflicts: # cps/__init__.py # cps/comic.py # cps/editbooks.py # cps/helper.py # cps/kobo.py # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/uploader.py # cps/web.py
This commit is contained in:
@@ -62,7 +62,7 @@ def get_sidebar_config(kwargs=None):
|
||||
sidebar = list()
|
||||
sidebar.append({"glyph": "glyphicon-book", "text": _('Recently Added'), "link": 'web.index', "id": "new",
|
||||
"visibility": constants.SIDEBAR_RECENT, 'public': True, "page": "root",
|
||||
"show_text": _('Show recent books'), "config_show": True})
|
||||
"show_text": _('Show recent books'), "config_show":False})
|
||||
sidebar.append({"glyph": "glyphicon-fire", "text": _('Hot Books'), "link": 'web.books_list', "id": "hot",
|
||||
"visibility": constants.SIDEBAR_HOT, 'public': True, "page": "hot",
|
||||
"show_text": _('Show Hot Books'), "config_show": True})
|
||||
@@ -161,6 +161,8 @@ class UserBase:
|
||||
return self.default_language
|
||||
|
||||
def check_visibility(self, value):
|
||||
if value == constants.SIDEBAR_RECENT:
|
||||
return True
|
||||
return constants.has_flag(self.sidebar_view, value)
|
||||
|
||||
def show_detail_random(self):
|
||||
@@ -621,7 +623,7 @@ def create_anonymous_user(session):
|
||||
session.add(user)
|
||||
try:
|
||||
session.commit()
|
||||
except Exception as e:
|
||||
except Exception:
|
||||
session.rollback()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user