From 27cbab6cb739852aea7c0d10f429f6c64f16ceb8 Mon Sep 17 00:00:00 2001 From: Jack Darlington Date: Fri, 3 Mar 2017 21:09:53 +0000 Subject: [PATCH] Fixes for READ/UNREAD --- cps/ub.py | 3 ++- cps/web.py | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cps/ub.py b/cps/ub.py index aa064282..56b61877 100644 --- a/cps/ub.py +++ b/cps/ub.py @@ -495,7 +495,8 @@ def create_admin_user(): user.nickname = "admin" user.role = ROLE_USER + ROLE_ADMIN + ROLE_DOWNLOAD + ROLE_UPLOAD + ROLE_EDIT + ROLE_PASSWD user.sidebar_view = DETAIL_RANDOM + SIDEBAR_LANGUAGE + SIDEBAR_SERIES + SIDEBAR_CATEGORY + SIDEBAR_HOT + \ - SIDEBAR_RANDOM + SIDEBAR_AUTHOR + SIDEBAR_BEST_RATED + SIDEBAR_RANDOM + SIDEBAR_AUTHOR + SIDEBAR_BEST_RATED + SIDEBAR_READ_AND_UNREAD + user.password = generate_password_hash(DEFAULT_PASS) diff --git a/cps/web.py b/cps/web.py index f15fe904..4949dcd2 100755 --- a/cps/web.py +++ b/cps/web.py @@ -2084,6 +2084,8 @@ def new_user(): content.sidebar_view += ub.SIDEBAR_CATEGORY if "show_hot" in to_save: content.sidebar_view += ub.SIDEBAR_HOT + if "show_read_and_unread" in to_save: + content.sidebar_view += ub.SIDEBAR_READ_AND_UNREAD if "show_best_rated" in to_save: content.sidebar_view += ub.SIDEBAR_BEST_RATED if "show_author" in to_save: @@ -2231,6 +2233,11 @@ def edit_user(user_id): elif "show_best_rated" not in to_save and content.show_best_rated_books(): content.sidebar_view -= ub.SIDEBAR_BEST_RATED + if "show_read_and_unread" in to_save: + content.sidebar_view += ub.SIDEBAR_READ_AND_UNREAD + elif "show_read_and_unread" not in to_save and content.show_read_and_unread(): + content.sidebar_view += ub.SIDEBAR_READ_AND_UNREAD + if "show_author" in to_save and not content.show_author(): content.sidebar_view += ub.SIDEBAR_AUTHOR elif "show_author" not in to_save and content.show_author():