Selaa lähdekoodia

AMBARI-14062. $.timeago for config versions should use not converted with timezone timestamps (onechiporenko)

Oleg Nechiporenko 10 vuotta sitten
vanhempi
commit
a9484c6e67

+ 2 - 0
ambari-web/app/mappers/hosts_mapper.js

@@ -50,6 +50,7 @@ App.hostsMapper = App.QuickDataMapper.create({
     mem_total: 'metrics.memory.mem_total',
     mem_free: 'metrics.memory.mem_free',
     last_heart_beat_time: "Hosts.last_heartbeat_time",
+    raw_last_heart_beat_time: "Hosts.last_heartbeat_time",
     os_arch: 'Hosts.os_arch',
     os_type: 'Hosts.os_type',
     ip: 'Hosts.ip',
@@ -175,6 +176,7 @@ App.hostsMapper = App.QuickDataMapper.create({
         }
         var parsedItem = this.parseIt(item, this.config);
         parsedItem.is_requested = true;
+        parsedItem.last_heart_beat_time = App.dateTimeWithTimeZone(parsedItem.last_heart_beat_time);
         parsedItem.selected = selectedHosts.contains(parsedItem.host_name);
         parsedItem.not_started_components = notStartedComponents;
         parsedItem.components_in_passive_state = componentsInPassiveState;

+ 3 - 2
ambari-web/app/models/configs/service_config_version.js

@@ -30,6 +30,7 @@ App.ServiceConfigVersion = DS.Model.extend({
   groupId: DS.attr('number'),
   version: DS.attr('number'),
   createTime: DS.attr('number'),
+  rawCreateTime: DS.attr('number'),
   author: DS.attr('string'),
   notes: DS.attr('string'),
   service: DS.belongsTo('App.Service'),
@@ -74,8 +75,8 @@ App.ServiceConfigVersion = DS.Model.extend({
     return dateUtil.dateFormat(this.get('createTime'));
   }.property('createTime'),
   timeSinceCreated: function () {
-    return $.timeago(this.get('createTime'));
-  }.property('createTime'),
+    return $.timeago(this.get('rawCreateTime'));
+  }.property('rawCreateTime'),
   /**
    * determine whether ServiceConfigVersion is requested from server
    */

+ 1 - 0
ambari-web/app/models/host.js

@@ -38,6 +38,7 @@ App.Host = DS.Model.extend({
   rack: DS.attr('string'),
   healthStatus: DS.attr('string'),
   lastHeartBeatTime: DS.attr('number'),
+  rawLastHeartBeatTime: DS.attr('number'),
   osType: DS.attr("string"),
   diskInfo: DS.attr('object'),
   loadOne:DS.attr('number'),

+ 2 - 2
ambari-web/app/views/main/host/summary.js

@@ -293,9 +293,9 @@ App.MainHostSummaryView = Em.View.extend(App.TimeRangeMixin, {
    * @type {String}
    */
   timeSinceHeartBeat: function () {
-    var d = this.get('content.lastHeartBeatTime');
+    var d = this.get('content.rawLastHeartBeatTime');
     return d ? $.timeago(d) : '';
-  }.property('content.lastHeartBeatTime'),
+  }.property('content.rawLastHeartBeatTime'),
 
   /**
    * Get clients with custom commands