aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/dialog/Notification.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-03-22 22:58:18 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2020-03-22 22:58:18 -0700
commitba9cc86f667486a09edb323402c2d63ada5ea639 (patch)
tree8df80eca54f9dd39664f63365ffcc2ec248fb3df /web/app/view/dialog/Notification.js
parent990d485a21c945e7d57b85378650a65f3e79eed3 (diff)
parentf5165c8e897e8d9cf4219d943e2d34b61adb48b5 (diff)
downloadetbsa-traccar-web-ba9cc86f667486a09edb323402c2d63ada5ea639.tar.gz
etbsa-traccar-web-ba9cc86f667486a09edb323402c2d63ada5ea639.tar.bz2
etbsa-traccar-web-ba9cc86f667486a09edb323402c2d63ada5ea639.zip
Merge branch 'master' into modern
Diffstat (limited to 'web/app/view/dialog/Notification.js')
-rw-r--r--web/app/view/dialog/Notification.js21
1 files changed, 19 insertions, 2 deletions
diff --git a/web/app/view/dialog/Notification.js b/web/app/view/dialog/Notification.js
index dc4362d..51af5b8 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',