From b1d2b68bb1ba9926c83f5fe071a7f2c0472fec23 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 18 Jan 2019 14:31:41 -0800 Subject: [PATCH] Revert "Merge pull request #1 from hexeth/reader-theme" This reverts commit fb7bd0c49b59e52f7669d268f968c8e663185578, reversing changes made to ae55dd6c27ba8ae9c3b77eca7780ba52ac53c1bb. --- cps/web.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cps/web.py b/cps/web.py index 2d3ba142..0a52947e 100644 --- a/cps/web.py +++ b/cps/web.py @@ -682,7 +682,6 @@ def before_request(): g.allow_registration = config.config_public_reg g.allow_upload = config.config_uploading g.current_theme = config.config_theme - g.current_reader_theme = config.config_reader_theme g.public_shelfes = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1).order_by(ub.Shelf.name).all() if not config.db_configured and request.endpoint not in ('basic_configuration', 'login') and '/static/' not in request.path: return redirect(url_for('basic_configuration')) @@ -2905,9 +2904,7 @@ def view_configuration(): if "config_read_column" in to_save: content.config_read_column = int(to_save["config_read_column"]) if "config_theme" in to_save: - content.config_theme = int(to_save["config_reader_theme"]) - if "config_reader_theme" in to_save: - content.config_reader_theme = int(to_save["config_reader_theme"]) + content.config_theme = int(to_save["config_theme"]) if "config_title_regex" in to_save: if content.config_title_regex != to_save["config_title_regex"]: content.config_title_regex = to_save["config_title_regex"]