Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed default last change time format.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-03-19 17:27:32 +03:00
parent a533f7f6b3
commit 29fbfbe2f8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/panel-triggers/editor.js
View File

@@ -53,8 +53,7 @@ class TriggerPanelEditorCtrl{
var scopeDefaults = { var scopeDefaults = {
metric: {}, metric: {},
inputStyles: {}, inputStyles: {},
oldTarget: _.cloneDeep(this.panel.triggers), oldTarget: _.cloneDeep(this.panel.triggers)
defaultTimeFormat: "DD MMM YYYY HH:mm:ss"
}; };
_.defaults(this, scopeDefaults); _.defaults(this, scopeDefaults);

3
src/panel-triggers/module.js
View File

@@ -52,6 +52,8 @@ var triggerStatusMap = {
'1': 'Problem' '1': 'Problem'
}; };
var defaultTimeFormat = "DD MMM YYYY HH:mm:ss";
class TriggerPanelCtrl extends PanelCtrl { class TriggerPanelCtrl extends PanelCtrl {
/** @ngInject */ /** @ngInject */
@@ -59,6 +61,7 @@ class TriggerPanelCtrl extends PanelCtrl {
super($scope, $injector); super($scope, $injector);
this.datasourceSrv = datasourceSrv; this.datasourceSrv = datasourceSrv;
this.triggerStatusMap = triggerStatusMap; this.triggerStatusMap = triggerStatusMap;
this.defaultTimeFormat = defaultTimeFormat;
// Load panel defaults // Load panel defaults
_.defaults(this.panel, panelDefaults); _.defaults(this.panel, panelDefaults);