Issue #2 - updater js fix

styxit · Aug 4, 2013 · e212aaa · e212aaa
1 parent bd59f3a
commit e212aaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/htpc/updater.py b/htpc/updater.py
@@ -29,7 +29,7 @@ def index(self):
         """ Handle server requests. Update on POST. Get status on GET. """
         if self.git == '':
             self.logger.warning('Git not configured. Automatic update disabled.')
-            return -1 
+            return -1
         if cherrypy.request.method.upper() == 'POST':
             Thread(target=self.git_update).start()
             return 1
@@ -87,8 +87,7 @@ def check_update(self):
         else:
             behind = self.behind_by(current, latest)
             self.logger.info("Currently " + str(behind) + " commits behind.")
-            return (behind, 'https://github.com/%s/%s/compare/%s...%s' % (
-                      self.user, self.repo, current, latest))
+            return behind
 
     def git_update(self):
         """ Do update through git """

diff --git a/interfaces/default/js/default.js b/interfaces/default/js/default.js
@@ -42,8 +42,8 @@ $(document).ready(function () {
         $.getJSON(WEBDIR + 'update/', function (data) {
             if (data == 0) {
                 notify('Update', 'Already running latest version.', 'success')
-            } else if ($.isNumeric(data[0] && data[0] > 0)) {
-                if (confirm('Your are '+data[0]+' versions behind. Update to latest version?')) {
+            } else if ($.isNumeric(data) && data > 0) {
+                if (confirm('Your are '+data+' versions behind. Update to latest version?')) {
                     $.post(WEBDIR + 'update/', function (data) {
                         if (data == 1) {
                             showModal('Installing update', '<div class="progress progress-striped active"><div class="bar" style="width:100%"></div></div>','')