Merge branch 'master' into Develop

# Conflicts: # cps/admin.py
2020-01-27 18:20:50 +01:00
parent 004d9118bc acfad7a982
commit 4ab3dc2599
32 changed files with 268 additions and 266 deletions
@@ -925,10 +925,12 @@ def view_logfile():
    logfiles = {}
    logfiles[0] = logger.get_logfile(config.config_logfile)
    logfiles[1] = logger.get_accesslogfile(config.config_access_logfile)
-    return render_title_template("logviewer.html",title=_(u"Logfile viewer"),
-                                 log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT),
+    return render_title_template("logviewer.html",
+                                 title=_(u"Logfile viewer"),
                                 accesslog_enable=config.config_access_log,
-                                 logfiles=logfiles, page="logfile")
+                                 log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT),
+                                 logfiles=logfiles,
+                                 page="logfile")


@admi.route("/ajax/log/<int:logtype>")