From 0f2941435f5941b747e88cfe838c48fb3a197b35 Mon Sep 17 00:00:00 2001 From: echel0n Date: Sun, 27 Jul 2014 17:21:55 -0700 Subject: [PATCH] Testing checkout feature --- gui/slick/js/config.js | 6 +++--- sickbeard/webserve.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/slick/js/config.js b/gui/slick/js/config.js index 130a23d3..c062c1f6 100644 --- a/gui/slick/js/config.js +++ b/gui/slick/js/config.js @@ -42,7 +42,7 @@ $(document).ready(function () { $('#date_presets').val(def) }); - // bind 'myForm' and provide a simple callback function + // bind 'myForm' and provide a simple callback function $('#configForm').ajaxForm({ beforeSubmit: function () { $('.config_submitter').each(function () { @@ -72,8 +72,8 @@ $(document).ready(function () { $('#branchCheckout').click(function () { $("#branchCheckout").attr("disabled", true); - url = sbRoot+'/home/branchCheckout?branch='+$("#branchVersion").val(); - window.location.href = url; + $.get(sbRoot + "/home/branchCheckout", {'branch': $("#branchVersion").val()}, + function (data){ $(this).html(data); }); }); }); diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 7232729a..75508946 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -3469,7 +3469,7 @@ class Home(MainHandler): "Update wasn't successful, not restarting. Check your log for more information.") def branchCheckout(self, branch): - self.update(sickbeard.PID, branch) + return self.update(sickbeard.PID, branch) def displayShow(self, show=None):