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

Server was being killed on state change before it could retrieve quote.

Browse Source
This commit is contained in:
Tim
2015-07-18 23:33:45 +02:00
parent ba1dfea9eb
commit 2b118304f0
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div style="float: right;"><span class="muted" id="rquote"></span></div> <div style="float: right;"><span class="muted" id="rquote">${quote}</span></div>
</div> </div>
</div> </div>
</div> </div>
@@ -45,16 +45,5 @@
function reloadPage() { function reloadPage() {
window.location.href = "index"; window.location.href = "index";
} }
$(document).ready(function () {
$.ajax({
url: 'random_arnold_quotes',
cache: false,
async: true,
success: function (data) {
$("#rquote").html(data);
}
});
});
</script> </script>
</%def> </%def>

6
plexpy/webserve.py
View File

@@ -455,10 +455,12 @@ class WebInterface(object):
@cherrypy.expose @cherrypy.expose
def do_state_change(self, signal, title, timer): def do_state_change(self, signal, title, timer):
plexpy.SIGNAL = signal
message = title message = title
quote = self.random_arnold_quotes()
plexpy.SIGNAL = signal
return serve_template(templatename="shutdown.html", title=title, return serve_template(templatename="shutdown.html", title=title,
message=message, timer=timer) message=message, timer=timer, quote=quote)
@cherrypy.expose @cherrypy.expose
def get_history(self, user=None, user_id=None, **kwargs): def get_history(self, user=None, user_id=None, **kwargs):