anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Redirect to proper HTTP root on state change

Browse Source
This commit is contained in:
JonnyWong16
2016-11-05 12:13:53 -07:00
parent 254f41a2cc
commit 57f1af05f5
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/interfaces/default/shutdown.html
View File

@@ -47,7 +47,7 @@
// Redirect to home page after countdown. // Redirect to home page after countdown.
function reloadPage() { function reloadPage() {
window.location.href = "index"; window.location.href = "${new_http_root}index";
} }
</script> </script>
</%def> </%def>

7
plexpy/webserve.py
View File

@@ -3212,8 +3212,13 @@ class WebInterface(object):
quote = self.random_arnold_quotes() quote = self.random_arnold_quotes()
plexpy.SIGNAL = signal plexpy.SIGNAL = signal
if plexpy.CONFIG.HTTP_ROOT:
new_http_root = '/' + plexpy.CONFIG.HTTP_ROOT.strip('/') + '/'
else:
new_http_root = '/'
return serve_template(templatename="shutdown.html", title=title, return serve_template(templatename="shutdown.html", title=title,
message=message, timer=timer, quote=quote) new_http_root=new_http_root, message=message, timer=timer, quote=quote)
@cherrypy.expose @cherrypy.expose
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))