1 files changed, 19 insertions, 2 deletions
diff --git a/web/app/view/dialog/Notification.js b/web/app/view/dialog/Notification.js
index dc4362d9..51af5b8e 100644
--- a/web/app/view/dialog/Notification.js
+++ b/web/app/view/dialog/Notification.js
@@ -41,7 +41,10 @@ Ext.define('Traccar.view.dialog.Notification', {
                 displayField: 'name',
                 valueField: 'type',
                 editable: false,
-                allowBlank: false
+                allowBlank: false,
+                listeners: {
+                    change: 'onTypeChange'
+                }
             }, {
                 xtype: 'checkboxfield',
                 inputValue: true,
@@ -49,8 +52,22 @@ Ext.define('Traccar.view.dialog.Notification', {
                 name: 'always',
                 fieldLabel: Strings.notificationAlways
             }, {
-                fieldLabel: Strings.notificationNotificators,
                 xtype: 'tagfield',
+                reference: 'alarmsField',
+                fieldLabel: Strings.sharedAlarms,
+                maxWidth: Traccar.Style.formFieldWidth,
+                store: 'AlarmTypes',
+                valueField: 'key',
+                displayField: 'name',
+                queryMode: 'local',
+                hidden: true,
+                listeners: {
+                    beforerender: 'onAlarmsLoad',
+                    change: 'onAlarmsChange'
+                }
+            }, {
+                xtype: 'tagfield',
+                fieldLabel: Strings.notificationNotificators,
                 name: 'notificators',
                 maxWidth: Traccar.Style.formFieldWidth,
                 store: 'AllNotificators',