From ed459ddb9bff060c3230a14b933311949fee7726 Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Wed, 15 Feb 2017 18:19:48 +0100 Subject: [PATCH] Bugfix display of commit date --- cps/web.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cps/web.py b/cps/web.py index efecfe56..1c16f6ae 100755 --- a/cps/web.py +++ b/cps/web.py @@ -1577,9 +1577,10 @@ def profile(): @login_required @admin_required def admin(): + commit = '$Format:%cI$' content = ub.session.query(ub.User).all() settings = ub.session.query(ub.Settings).first() - return render_title_template("admin.html", content=content, email=settings, config=config, + return render_title_template("admin.html", content=content, email=settings, config=config, commit=commit, development=ub.DEVELOPMENT, title=_(u"Admin page")) @@ -1598,7 +1599,6 @@ def basic_configuration(): def configuration_helper(origin): global global_task - commit='$Format:%cI$' reboot_required = False db_change = False success = False @@ -1659,13 +1659,13 @@ def configuration_helper(origin): logging.getLogger("book_formats").setLevel(config.config_log_level) except e: flash(e, category="error") - return render_title_template("config_edit.html", content=config, origin=origin, commit=commit, + return render_title_template("config_edit.html", content=config, origin=origin, title=_(u"Basic Configuration")) if db_change: reload(db) if not db.setup_db(): flash(_(u'DB location is not valid, please enter correct path'), category="error") - return render_title_template("config_edit.html", content=config, origin=origin, commit=commit, + return render_title_template("config_edit.html", content=config, origin=origin, title=_(u"Basic Configuration")) if reboot_required: # db.engine.dispose() # ToDo verify correct @@ -1678,7 +1678,7 @@ def configuration_helper(origin): app.logger.info('Reboot required, restarting') if origin: success = True - return render_title_template("config_edit.html", origin=origin, success=success, content=config, commit=commit, + return render_title_template("config_edit.html", origin=origin, success=success, content=config, title=_(u"Basic Configuration"))