瀏覽代碼

AMBARI-7501. Ambari Web absolute/exact date time string follow local timezone.(xiwang)

Xi Wang 10 年之前
父節點
當前提交
a539800a65
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      ambari-web/app/utils/date.js
  2. 1 1
      ambari-web/app/views/main/dashboard/widgets/uptime_text_widget.js

+ 3 - 3
ambari-web/app/utils/date.js

@@ -60,7 +60,7 @@ module.exports = {
     }
     }
     format = format || 'ddd, MMM DD, YYYY HH:mm';
     format = format || 'ddd, MMM DD, YYYY HH:mm';
 
 
-    return moment((new Date(timestamp)).toISOString().replace('Z', '')).format(format);
+    return moment((new Date(timestamp))).format(format);
   },
   },
 
 
   /**
   /**
@@ -75,8 +75,8 @@ module.exports = {
       return timestamp;
       return timestamp;
     }
     }
     var format = 'ddd MMM DD YYYY';
     var format = 'ddd MMM DD YYYY';
-    var date = moment((new Date(timestamp)).toISOString().replace('Z', '')).format(format);
-    var today = moment((new Date()).toISOString().replace('Z', '')).format(format);
+    var date = moment((new Date(timestamp))).format(format);
+    var today = moment((new Date())).format(format);
     if (date === today) {
     if (date === today) {
       return 'Today ' + (new Date(timestamp)).toLocaleTimeString();
       return 'Today ' + (new Date(timestamp)).toLocaleTimeString();
     }
     }

+ 1 - 1
ambari-web/app/views/main/dashboard/widgets/uptime_text_widget.js

@@ -54,7 +54,7 @@ App.UptimeTextDashboardWidgetView = App.TextDashboardWidgetView.extend({
   }.property('data'),
   }.property('data'),
 
 
   timeConverter: function (timestamp) {
   timeConverter: function (timestamp) {
-    var m = moment((new Date(timestamp)).toISOString().replace('Z', ''));
+    var m = moment((new Date(timestamp)));
     return [m.format('ddd MMM DD YYYY'), m.format('HH:mm:ss')];
     return [m.format('ddd MMM DD YYYY'), m.format('HH:mm:ss')];
   },
   },