From 533e17656681ab26737a16d1ca26a09fabe802e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 23 Jan 2014 12:34:35 +0100 Subject: [PATCH] Fixed issue with date parsing, now saved absolute range should work again --- src/app/services/graphite/graphiteSrv.js | 27 +++++++++++++----------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/app/services/graphite/graphiteSrv.js b/src/app/services/graphite/graphiteSrv.js index 9a11eab5a21..e7e7b2ac87f 100644 --- a/src/app/services/graphite/graphiteSrv.js +++ b/src/app/services/graphite/graphiteSrv.js @@ -3,8 +3,9 @@ define([ 'underscore', 'jquery', 'config', + 'kbn' ], -function (angular, _, $, config) { +function (angular, _, $, config, kbn) { 'use strict'; var module = angular.module('kibana.services'); @@ -37,19 +38,21 @@ function (angular, _, $, config) { }; this.translateTime = function(date) { - if (_.isDate(date)) { - return $.plot.formatDate(date, '%H%:%M_%Y%m%d'); + if (_.isString(date)) { + if (date === 'now') { + return 'now'; + } + else if (date.indexOf('now') > 0) { + date = date.substring(3); + date = date.replace('m', 'min'); + date = date.replace('M', 'mon'); + return date; + } + + date = kbn.parseDate(date); } - if (date === 'now') { - return 'now'; - } - - date = date.substring(3); - date = date.replace('m', 'min'); - date = date.replace('M', 'mon'); - - return date; + return $.plot.formatDate(date, '%H%:%M_%Y%m%d'); }; this.match = function(targets, graphiteTargetStr) {