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

Merge pull request #3196 from utkarshcmu/custom-time

Browse Source 
Timepicker display fixed for now-*
This commit is contained in:
Torkel Ödegaard
2015-11-11 11:28:55 +01:00
parent 4051f04e66 9f17e4ee2c
commit 3cdb3f0d54
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,8 +134,12 @@ _.each(rangeOptions, function (frame) {
return from.fromNow() + ' to ' + formatDate(range.to);
}
var res = describeTextRange(range.from);
return res.display;
if (range.to.toString() === 'now') {
var res = describeTextRange(range.from);
return res.display;
}
return range.from.toString() + ' to ' + range.to.toString();
}
export = {