Merge pull request #401 from EverythingMe/fix/wrong_time_zone

Fix: use correct date when converting to UTC to get correct timezone.
getredash · Apr 2, 2015 · 267c32b · 267c32b
2 parents e80e52f + aeff3f1
commit 267c32b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/rd_ui/app/scripts/directives/query_directives.js b/rd_ui/app/scripts/directives/query_directives.js
@@ -138,7 +138,7 @@
         }
 
         $scope.updateSchedule = function() {
-          var newSchedule = moment($scope.hour + ":" + $scope.minute, 'HH:mm').utc().format('HH:mm');
+          var newSchedule = moment().hour($scope.hour).minute($scope.minute).utc().format('HH:mm');
           if (newSchedule != $scope.query.schedule) {
             $scope.query.schedule = newSchedule;
             $scope.saveQuery();

diff --git a/rd_ui/app/scripts/filters.js b/rd_ui/app/scripts/filters.js
@@ -29,7 +29,8 @@ angular.module('redash.filters', []).
       if (schedule === null) {
         return "Never";
       } else if (schedule.match(/\d\d:\d\d/) !== null) {
-        var localTime = moment.utc(schedule, 'HH:mm').local().format('HH:mm');
+        var parts = schedule.split(':');
+        var localTime = moment.utc().hour(parts[0]).minute(parts[1]).local().format('HH:mm');
         return "Every day at " + localTime;
       }
 

diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js
@@ -402,7 +402,8 @@
     }
 
     Query.prototype.scheduleInLocalTime = function() {
-      return moment.utc(this.schedule, 'HH:mm').local().format('HH:mm');
+      var parts = this.schedule.split(':');
+      return moment.utc().hour(parts[0]).minute(parts[1]).local().format('HH:mm');
     }
 
     Query.prototype.getQueryResult = function (maxAge, parameters) {