mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Timepicker display fixed for now-*
This commit is contained in:
parent
2371dcf694
commit
167c02d773
@ -133,6 +133,10 @@ _.each(rangeOptions, function (frame) {
|
||||
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);
|
||||
return res.display;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user