Merge branch 'master' into fix-edge-zombie-consumer-cleanup
This commit is contained in:
commit
6d30b2884a
@ -851,6 +851,9 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
|
||||
content = this.defaultContent(key, contentInfo, value);
|
||||
}
|
||||
if (isDefined(content)) {
|
||||
if (typeof content === 'object') {
|
||||
content = JSON.stringify(content);
|
||||
}
|
||||
content = this.utils.customTranslation(content, content);
|
||||
switch (typeof content) {
|
||||
case 'string':
|
||||
|
||||
@ -271,6 +271,11 @@ export const alarmFields: {[fieldName: string]: AlarmField} = {
|
||||
keyName: 'assignee',
|
||||
value: 'assignee',
|
||||
name: 'alarm.assignee'
|
||||
},
|
||||
details: {
|
||||
keyName: 'details',
|
||||
value: 'details',
|
||||
name: 'alarm.details'
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user