don't show time for triggers with lastchange=0, fix #412
This commit is contained in:
4
dist/panel-triggers/partials/module.html
vendored
4
dist/panel-triggers/partials/module.html
vendored
@@ -25,7 +25,7 @@
|
||||
ng-style="{color: trigger.color}">
|
||||
{{trigger.severity}}
|
||||
</span>
|
||||
for {{trigger.age}}
|
||||
{{trigger.age && "for " + trigger.age}}
|
||||
|
||||
<span class="alert-list-info alert-list-info-left" ng-if="ctrl.panel.descriptionField">
|
||||
{{trigger.comments}}
|
||||
@@ -39,7 +39,7 @@
|
||||
<i class="gicon gicon-datasources"></i>
|
||||
{{trigger.datasource}}
|
||||
</span>
|
||||
<span class="alert-list-text">{{trigger.lastchange}}</span>
|
||||
<span class="alert-list-text">{{trigger.lastchange || "last change unknown"}}</span>
|
||||
</div>
|
||||
|
||||
<div class="trigger-info-block">
|
||||
|
||||
6
dist/panel-triggers/triggers_panel_ctrl.js
vendored
6
dist/panel-triggers/triggers_panel_ctrl.js
vendored
@@ -476,6 +476,12 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
|
||||
}, {
|
||||
key: 'setTriggerLastChange',
|
||||
value: function setTriggerLastChange(trigger) {
|
||||
if (!trigger.lastchangeUnix) {
|
||||
trigger.lastchange = "";
|
||||
trigger.age = "";
|
||||
return trigger;
|
||||
}
|
||||
|
||||
var timestamp = moment.unix(trigger.lastchangeUnix);
|
||||
if (this.panel.customLastChangeFormat) {
|
||||
// User defined format
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user