NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mismerge

Browse Source
This commit is contained in:
Ghighi Eftimie 2020-01-27 15:24:11 +02:00
parent 647e954e8a
commit fc79cdfaa2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/admin.py
View File

@ -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/<int:logtype>")