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

triggers panel: adjust sort order

Browse Source
This commit is contained in:
Alexander Zobnin
2017-12-12 22:32:22 +03:00
parent 4167f5db70
commit 1bc4c3384b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/panel-triggers/triggers_panel_ctrl.js vendored
View File

@@ -421,9 +421,9 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
key: 'sortTriggers', key: 'sortTriggers',
value: function sortTriggers(triggerList) { value: function sortTriggers(triggerList) {
if (this.panel.sortTriggersBy.value === 'priority') { if (this.panel.sortTriggersBy.value === 'priority') {
triggerList = _.orderBy(triggerList, ['priority', 'triggerid'], ['desc', 'desc']); triggerList = _.orderBy(triggerList, ['priority', 'lastchangeUnix', 'triggerid'], ['desc', 'desc', 'desc']);
} else { } else {
triggerList = _.orderBy(triggerList, ['lastchangeUnix', 'triggerid'], ['desc', 'desc']); triggerList = _.orderBy(triggerList, ['lastchangeUnix', 'priority', 'triggerid'], ['desc', 'desc', 'desc']);
} }
return triggerList; return triggerList;
} }

2
dist/panel-triggers/triggers_panel_ctrl.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
src/panel-triggers/triggers_panel_ctrl.js
View File

@@ -293,9 +293,9 @@ export class TriggerPanelCtrl extends PanelCtrl {
sortTriggers(triggerList) { sortTriggers(triggerList) {
if (this.panel.sortTriggersBy.value === 'priority') { if (this.panel.sortTriggersBy.value === 'priority') {
triggerList = _.orderBy(triggerList, ['priority', 'triggerid'], ['desc', 'desc']); triggerList = _.orderBy(triggerList, ['priority', 'lastchangeUnix', 'triggerid'], ['desc', 'desc', 'desc']);
} else { } else {
triggerList = _.orderBy(triggerList, ['lastchangeUnix', 'triggerid'], ['desc', 'desc']); triggerList = _.orderBy(triggerList, ['lastchangeUnix', 'priority', 'triggerid'], ['desc', 'desc', 'desc']);
} }
return triggerList; return triggerList;
} }