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

feat(timepickerv2): fixed lots of minor issues and updated kairosdb and opentsdb data sources to work with the new date formats

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-09-18 15:06:08 +02:00
parent febe56b062
commit 96b0e70ddd
11 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
import moment = require('moment');
import _ = require('lodash');
import dateMath = require('./datemath');
import dateMath = require('app/core/utils/datemath');
import angular = require('angular');
var spans = {
@@ -112,6 +112,10 @@ _.each(rangeOptions, function (frame) {
return option.display;
}
if (moment.isMoment(range.from) && moment.isMoment(range.to)) {
return formatDate(range.from) + ' to ' + formatDate(range.to);
}
if (moment.isMoment(range.from)) {
var toMoment = dateMath.parse(range.to, true);
return formatDate(range.from) + ' to ' + toMoment.fromNow();