From 647e954e8afddbcc3401a0f8ba4ad675769edfe1 Mon Sep 17 00:00:00 2001 From: Ghighi Eftimie Date: Sun, 26 Jan 2020 20:53:03 +0200 Subject: [PATCH 1/2] fix admin view of error log --- cps/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/admin.py b/cps/admin.py index d338da42..b7f6165a 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -672,7 +672,7 @@ def view_logfile(): 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") + log_enable=True, logfiles=logfiles, page="logfile") @admi.route("/ajax/log/") From fc79cdfaa259effd9989e4f0d35efb02065df9b8 Mon Sep 17 00:00:00 2001 From: Ghighi Eftimie Date: Mon, 27 Jan 2020 15:24:11 +0200 Subject: [PATCH 2/2] fix mismerge --- cps/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/admin.py b/cps/admin.py index b7f6165a..4a7a28a7 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -672,7 +672,7 @@ def view_logfile(): 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, - log_enable=True, logfiles=logfiles, page="logfile") + log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT), logfiles=logfiles, page="logfile") @admi.route("/ajax/log/")