Browse Source

AMBARI-8793. Host Details > Alerts: timestamps shown don't make sense (onechiporenko)

Oleg Nechiporenko 10 years ago
parent
commit
aa3cc9402e

+ 1 - 1
ambari-web/app/models/alert_instance.js

@@ -120,7 +120,7 @@ App.AlertInstance = DS.Model.extend({
   statusChangedAndLastCheckedFormatted: function () {
     var lastCheckedFormatted = this.get('lastCheckedFormatted');
     var lastTriggeredFormatted = this.get('lastTriggeredFormatted');
-    return Em.I18n.t('models.alert_definition.triggered.checked').format(lastCheckedFormatted, lastTriggeredFormatted);
+    return Em.I18n.t('models.alert_definition.triggered.checked').format(lastTriggeredFormatted, lastCheckedFormatted);
   }.property('lastCheckedFormatted', 'lastTriggeredFormatted'),
 
   /**

+ 18 - 0
ambari-web/test/models/alert_instance_test.js

@@ -38,5 +38,23 @@ describe('App.AlertInstance', function () {
     });
 
   });
+
+  describe('#statusChangedAndLastCheckedFormatted', function () {
+
+    it('should Status Changed before Last Checked', function () {
+
+      var lastCheckedFormatted = '123',
+        lastTriggeredFormatted = '321';
+
+      model.reopen({
+        lastCheckedFormatted: lastCheckedFormatted,
+        lastTriggeredFormatted: lastTriggeredFormatted
+      });
+      var status = model.get('statusChangedAndLastCheckedFormatted');
+      expect(status.indexOf(lastCheckedFormatted) > status.indexOf(lastTriggeredFormatted)).to.be.true;
+
+    });
+
+  });
   
 });