triggers panel: show data source info for trigger

This commit is contained in:
Alexander Zobnin
2017-12-11 11:35:03 +03:00
parent 5e7a3d7a5d
commit 087a4de9a0
10 changed files with 59 additions and 17 deletions

View File

@@ -33,10 +33,13 @@
</div>
</div>
<div class="alert-list-footer">
<span class="alert-list-text">{{trigger.lastchange}}</span>
<span class="alert-list-text">
<!--Img Link-->
</span>
<div class="trigger-info-block">
<span ng-if="ctrl.panel.datasources.length > 1" class="alert-list-text zabbix-trigger-source">
<i class="gicon gicon-datasources"></i>
{{trigger.datasource}}
</span>
<span class="alert-list-text">{{trigger.lastchange}}</span>
</div>
<div class="trigger-info-block">
<a ng-if="trigger.url" href="{{trigger.url}}" target="_blank">

View File

@@ -330,6 +330,8 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
return _this5.getAcknowledges(triggers, ds);
}).then(function (triggers) {
return _this5.filterTriggers(triggers, ds);
}).then(function (triggers) {
return _this5.addTriggerDataSource(triggers, ds);
});
});
@@ -402,6 +404,14 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
return triggerList;
}
}, {
key: 'addTriggerDataSource',
value: function addTriggerDataSource(triggers, ds) {
_.each(triggers, function (trigger) {
trigger.datasource = ds;
});
return triggers;
}
}, {
key: 'sortTriggers',
value: function sortTriggers(triggerList) {

File diff suppressed because one or more lines are too long