Commit 533e1765 by Torkel Ödegaard

Fixed issue with date parsing, now saved absolute range should work again

parent 915f2a49
...@@ -3,8 +3,9 @@ define([ ...@@ -3,8 +3,9 @@ define([
'underscore', 'underscore',
'jquery', 'jquery',
'config', 'config',
'kbn'
], ],
function (angular, _, $, config) { function (angular, _, $, config, kbn) {
'use strict'; 'use strict';
var module = angular.module('kibana.services'); var module = angular.module('kibana.services');
...@@ -37,19 +38,21 @@ function (angular, _, $, config) { ...@@ -37,19 +38,21 @@ function (angular, _, $, config) {
}; };
this.translateTime = function(date) { this.translateTime = function(date) {
if (_.isDate(date)) { if (_.isString(date)) {
return $.plot.formatDate(date, '%H%:%M_%Y%m%d');
}
if (date === 'now') { if (date === 'now') {
return 'now'; return 'now';
} }
else if (date.indexOf('now') > 0) {
date = date.substring(3); date = date.substring(3);
date = date.replace('m', 'min'); date = date.replace('m', 'min');
date = date.replace('M', 'mon'); date = date.replace('M', 'mon');
return date; return date;
}
date = kbn.parseDate(date);
}
return $.plot.formatDate(date, '%H%:%M_%Y%m%d');
}; };
this.match = function(targets, graphiteTargetStr) { this.match = function(targets, graphiteTargetStr) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment