From 3e8c34dcf171c623158f09a215151f06218564ac Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 24 Jul 2015 11:10:16 -0300 Subject: [PATCH] Fix restart default page --- gui/slick/interfaces/default/restart_bare.tmpl | 3 ++- gui/slick/js/restart.js | 2 +- sickbeard/webserve.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gui/slick/interfaces/default/restart_bare.tmpl b/gui/slick/interfaces/default/restart_bare.tmpl index 4ee6ccc65..ac795e04f 100644 --- a/gui/slick/interfaces/default/restart_bare.tmpl +++ b/gui/slick/interfaces/default/restart_bare.tmpl @@ -18,11 +18,12 @@ sbHttpPort = "$curSBHttpPort"; sbHttpsEnabled = "$curSBHttpsEnabled"; sbHandleReverseProxy = "$curSBHandleReverseProxy"; sbHost = "$curSBHost"; +sbDefaultPage = "$sbDefaultPage"; //--> </script> <script type="text/javascript" src="$sbRoot/js/lib/jquery-1.11.2.min.js?$sbPID"></script> -<script type="text/javascript" src="$sbRoot/js/restart.js?$sbPID"></script> +<script type="text/javascript" src="$sbRoot/js/restart.js?$sbPID&$sbDefaultPage"></script> #set themeSpinner = '-dark' if 'dark' == themeSpinner else '' <h2>Performing Restart</h2> diff --git a/gui/slick/js/restart.js b/gui/slick/js/restart.js index 1ee32d09f..ae7fb75b6 100644 --- a/gui/slick/js/restart.js +++ b/gui/slick/js/restart.js @@ -38,7 +38,7 @@ $(document).ready(function() { $('#restart_loading').hide(); $('#restart_success').show(); $('#refresh_message').show(); - setTimeout(function(){window.location = sbRoot + '/home/';}, 5000); + setTimeout(function(){window.location = sbRoot + '/' + sbDefaultPage + '/';}, 5000); } } diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index a8ff0fab6..6827fc7b5 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -129,6 +129,7 @@ class PageTemplate(CheetahTemplate): self.sbHttpsEnabled = sickbeard.ENABLE_HTTPS self.sbHandleReverseProxy = sickbeard.HANDLE_REVERSE_PROXY self.sbThemeName = sickbeard.THEME_NAME + self.sbDefaultPage = sickbeard.DEFAULT_PAGE self.sbLogin = rh.get_current_user() if rh.request.headers['Host'][0] == '[': -- GitLab