IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Timepicker display fixed for now-*

Browse Source
This commit is contained in:
utkarshcmu 2015-11-10 04:53:42 -08:00
parent 2371dcf694
commit 167c02d773
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/utils/rangeutil.ts
View File

@ -133,6 +133,10 @@ _.each(rangeOptions, function (frame) {
return from.fromNow() + ' to ' + formatDate(range.to); return from.fromNow() + ' to ' + formatDate(range.to);
} }
if (!moment.isMoment(range.from) && !moment.isMoment(range.to)) {
return formatDate(dateMath.parse(range.from, true)) + ' to ' + formatDate(dateMath.parse(range.to, true));
}
var res = describeTextRange(range.from); var res = describeTextRange(range.from);
return res.display; return res.display;
} }