arno/isso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix rendering of disabled.html for 'Sub URI' sites (#587)

Browse Source 
The disabled.html template uses the isso_host_script variable, but
that variable was not being passed when rendering that template
file.
This commit is contained in:
Jonathan Watt 2019-11-22 19:15:12 +00:00 committed by Jelmer Vernooij
parent 0f4e72c0e0
commit 3be36fd8b0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
isso/views/comments.py
View File

@ -1074,7 +1074,8 @@ class API(object):
def login(self, env, req): def login(self, env, req):
if not self.isso.conf.getboolean("admin", "enabled"): if not self.isso.conf.getboolean("admin", "enabled"):
return render_template('disabled.html') isso_host_script = self.isso.conf.get("server", "public-endpoint") or local.host
return render_template('disabled.html', isso_host_script=isso_host_script)
data = req.form data = req.form
password = self.isso.conf.get("admin", "password") password = self.isso.conf.get("admin", "password")
if data['password'] and data['password'] == password: if data['password'] and data['password'] == password:
@ -1096,7 +1097,7 @@ class API(object):
def admin(self, env, req): def admin(self, env, req):
isso_host_script = self.isso.conf.get("server", "public-endpoint") or local.host isso_host_script = self.isso.conf.get("server", "public-endpoint") or local.host
if not self.isso.conf.getboolean("admin", "enabled"): if not self.isso.conf.getboolean("admin", "enabled"):
return render_template('disabled.html') return render_template('disabled.html', isso_host_script=isso_host_script)
try: try:
data = self.isso.unsign(req.cookies.get('admin-session', ''), data = self.isso.unsign(req.cookies.get('admin-session', ''),
max_age=60 * 60 * 24) max_age=60 * 60 * 24)