Author: yusaku
Date: Thu Jan 31 01:58:54 2013
New Revision: 1440787
URL: http://svn.apache.org/viewvc?rev=1440787&view=rev
Log:
AMBARI-1313. Alert time jumps between 'less than a minute ago' and 'about a
minute ago'. (srimanth via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/models/alert.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1440787&r1=1440786&r2=1440787&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Jan 31 01:58:54 2013
@@ -213,6 +213,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1313. Alert time jumps between 'less than a minute ago' and 'about a
+ minute ago'. (srimanth via yusaku)
+
AMBARI-1304. When switching jobs in timeline + tasks charts, blank charts
show.
(Arun Kandregula via yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/models/alert.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/alert.js?rev=1440787&r1=1440786&r2=1440787&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/alert.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/alert.js Thu Jan 31 01:58:54
2013
@@ -79,12 +79,23 @@ App.Alert = DS.Model.extend({
}
var prevSuffix = $.timeago.settings.strings.suffixAgo;
$.timeago.settings.strings.suffixAgo = '';
- var since = prefix + $.timeago(d);
+ var since = prefix + $.timeago(this.makeTimeAtleastMinuteAgo(d));
$.timeago.settings.strings.suffixAgo = prevSuffix;
return since;
}
return "";
}.property('date', 'status'),
+
+ makeTimeAtleastMinuteAgo: function(d){
+ var diff = new Date().getTime() - d.getTime();
+ if (diff < 60000) {
+ diff = 60000 - diff;
+ var newD = new Date(d.getTime() - diff );
+ //console.log("Making time more than 1 minute. New time=",newD,", Old
time=",d);
+ return newD;
+ }
+ return d;
+ },
/**
* Provides more details about when this alert happened.
