Merge remote-tracking branch 'github/fix-admin-view-log-file'

4 years ago · b29b5b7ac1
parent 594c8aad91 fc79cdfaa2
commit b29b5b7ac1
1 changed files with 6 additions and 2 deletions
--- a/cps/admin.py
+++ b/cps/admin.py
@ -671,8 +671,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"), accesslog_enable=config.config_access_log,
-                                 logfiles=logfiles, page="logfile")
+    return render_title_template("logviewer.html",
+                                 title=_(u"Logfile viewer"),
+                                 accesslog_enable=config.config_access_log,
+                                 log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT),
+                                 logfiles=logfiles,
+                                 page="logfile")


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