소스 검색

AMBARI-7677. Slider View: Start Time/End Time sortings do not work. (akovalenko)

Aleksandr Kovalenko 10 년 전
부모
커밋
86798709cc

+ 2 - 2
contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js

@@ -262,8 +262,8 @@ App.SliderAppsMapper = App.Mapper.createWithMixins(App.RunPeriodically, {
           status: app.state,
           status: app.state,
           displayStatus: self.stateMap[app.state] || app.state,
           displayStatus: self.stateMap[app.state] || app.state,
           user: app.user,
           user: app.user,
-          started: app.startTime ? (new Date(app.startTime).toUTCString()) : "-",
-          ended: app.endTime ? (new Date(app.endTime).toUTCString()) : "-",
+          started: app.startTime || 0,
+          ended: app.endTime  || 0,
           appType: app.type.toUpperCase(),
           appType: app.type.toUpperCase(),
           diagnostics: app.diagnostics || "-",
           diagnostics: app.diagnostics || "-",
           description: app.description || "-",
           description: app.description || "-",

+ 4 - 2
contrib/views/slider/src/main/resources/ui/app/models/slider_app.js

@@ -53,7 +53,8 @@ App.SliderApp = DS.Model.extend({
    */
    */
 
 
   startedToLocalTime: function () {
   startedToLocalTime: function () {
-    return moment(this.get('started')).format('ddd, DD MMM YYYY, HH:mm:ss Z [GMT]');
+    var started = this.get('started');
+    return started ? moment(started).format('ddd, DD MMM YYYY, HH:mm:ss Z [GMT]') : '-';
   }.property('started'),
   }.property('started'),
 
 
   /**
   /**
@@ -66,7 +67,8 @@ App.SliderApp = DS.Model.extend({
    */
    */
 
 
   endedToLocalTime: function () {
   endedToLocalTime: function () {
-    return moment(this.get('ended')).format('ddd, DD MMM YYYY, HH:mm:ss Z [GMT]');
+    var ended = this.get('ended');
+    return ended ? moment(ended).format('ddd, DD MMM YYYY, HH:mm:ss Z [GMT]') : '-';
   }.property('ended'),
   }.property('ended'),
 
 
   /**
   /**