From 29fbfbe2f8258eb4fabe9ef1ae0f9593bf3248bc Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sat, 19 Mar 2016 17:27:32 +0300 Subject: [PATCH] Fixed default last change time format. --- src/panel-triggers/editor.js | 3 +-- src/panel-triggers/module.js | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/panel-triggers/editor.js b/src/panel-triggers/editor.js index 160ce4f..8a16b69 100644 --- a/src/panel-triggers/editor.js +++ b/src/panel-triggers/editor.js @@ -53,8 +53,7 @@ class TriggerPanelEditorCtrl{ var scopeDefaults = { metric: {}, inputStyles: {}, - oldTarget: _.cloneDeep(this.panel.triggers), - defaultTimeFormat: "DD MMM YYYY HH:mm:ss" + oldTarget: _.cloneDeep(this.panel.triggers) }; _.defaults(this, scopeDefaults); diff --git a/src/panel-triggers/module.js b/src/panel-triggers/module.js index fa35e32..b263c7a 100644 --- a/src/panel-triggers/module.js +++ b/src/panel-triggers/module.js @@ -52,6 +52,8 @@ var triggerStatusMap = { '1': 'Problem' }; +var defaultTimeFormat = "DD MMM YYYY HH:mm:ss"; + class TriggerPanelCtrl extends PanelCtrl { /** @ngInject */ @@ -59,6 +61,7 @@ class TriggerPanelCtrl extends PanelCtrl { super($scope, $injector); this.datasourceSrv = datasourceSrv; this.triggerStatusMap = triggerStatusMap; + this.defaultTimeFormat = defaultTimeFormat; // Load panel defaults _.defaults(this.panel, panelDefaults);