7 files changed, 7 insertions, 11 deletions
diff --git a/web/app/view/DeviceMenuController.js b/web/app/view/DeviceMenuController.js
index 58749a5e..4fa00bee 100644
--- a/web/app/view/DeviceMenuController.js
+++ b/web/app/view/DeviceMenuController.js
@@ -45,7 +45,7 @@ Ext.define('Traccar.view.DeviceMenuController', {
                 baseObjectName: 'deviceId',
                 linkObjectName: 'geofenceId',
                 storeName: 'Geofences',
-                baseObject: this.getView().ownerCmp.device.getId()
+                baseObject: this.getView().up('deviceMenu').device.getId()
             }
         }).show();
     },
@@ -58,7 +58,7 @@ Ext.define('Traccar.view.DeviceMenuController', {
                 baseObjectName: 'deviceId',
                 linkObjectName: 'notificationId',
                 storeName: 'Notifications',
-                baseObject: this.getView().ownerCmp.device.getId()
+                baseObject: this.getView().up('deviceMenu').device.getId()
             }
         }).show();
     },
@@ -71,7 +71,7 @@ Ext.define('Traccar.view.DeviceMenuController', {
                 baseObjectName: 'deviceId',
                 linkObjectName: 'attributeId',
                 storeName: 'ComputedAttributes',
-                baseObject: this.getView().ownerCmp.device.getId()
+                baseObject: this.getView().up('deviceMenu').device.getId()
             }
         }).show();
     },
@@ -84,7 +84,7 @@ Ext.define('Traccar.view.DeviceMenuController', {
                 baseObjectName: 'deviceId',
                 linkObjectName: 'driverId',
                 storeName: 'Drivers',
-                baseObject: this.getView().ownerCmp.device.getId()
+                baseObject: this.getView().up('deviceMenu').device.getId()
             }
         }).show();
     },
@@ -97,7 +97,7 @@ Ext.define('Traccar.view.DeviceMenuController', {
                 baseObjectName: 'deviceId',
                 linkObjectName: 'commandId',
                 storeName: 'Commands',
-                baseObject: this.getView().ownerCmp.device.getId()
+                baseObject: this.getView().up('deviceMenu').device.getId()
             }
         }).show();
     }
diff --git a/web/app/view/edit/CalendarsController.js b/web/app/view/edit/CalendarsController.js
index f5822279..d11ec379 100644
--- a/web/app/view/edit/CalendarsController.js
+++ b/web/app/view/edit/CalendarsController.js
@@ -28,5 +28,4 @@ Ext.define('Traccar.view.edit.CalendarsController', {
     objectModel: 'Traccar.model.Calendar',
     objectDialog: 'Traccar.view.dialog.Calendar',
     removeTitle: Strings.sharedCalendar
-
 });
diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js
index 40202e75..a4bbd4ba 100644
--- a/web/app/view/edit/DevicesController.js
+++ b/web/app/view/edit/DevicesController.js
@@ -106,7 +106,7 @@ Ext.define('Traccar.view.edit.DevicesController', {
         this.lookupReference('toolbarRemoveButton').setDisabled(empty || readonly || deviceReadonly);
         deviceMenu = this.lookupReference('toolbarDeviceMenu');
         deviceMenu.device = empty ? null : selected[0];
-        this.lookupReference('toolbarDeviceMenu').setDisabled(empty);
+        deviceMenu.setDisabled(empty);
         this.lookupReference('deviceCommandButton').setDisabled(empty || readonly);
     },
 
diff --git a/web/app/view/edit/DriversController.js b/web/app/view/edit/DriversController.js
index 2840c2a7..6c8a63cc 100644
--- a/web/app/view/edit/DriversController.js
+++ b/web/app/view/edit/DriversController.js
@@ -28,5 +28,4 @@ Ext.define('Traccar.view.edit.DriversController', {
     objectModel: 'Traccar.model.Driver',
     objectDialog: 'Traccar.view.dialog.Driver',
     removeTitle: Strings.sharedDriver
-
 });
diff --git a/web/app/view/edit/NotificationsController.js b/web/app/view/edit/NotificationsController.js
index bf6a6669..ad22a686 100644
--- a/web/app/view/edit/NotificationsController.js
+++ b/web/app/view/edit/NotificationsController.js
@@ -28,5 +28,4 @@ Ext.define('Traccar.view.edit.NotificationsController', {
     objectModel: 'Traccar.model.Notification',
     objectDialog: 'Traccar.view.dialog.Notification',
     removeTitle: Strings.sharedNotification
-
 });
diff --git a/web/app/view/edit/SavedCommandsController.js b/web/app/view/edit/SavedCommandsController.js
index 989aeabf..1511661e 100644
--- a/web/app/view/edit/SavedCommandsController.js
+++ b/web/app/view/edit/SavedCommandsController.js
@@ -28,5 +28,4 @@ Ext.define('Traccar.view.edit.SavedCommandsController', {
     objectModel: 'Traccar.model.Command',
     objectDialog: 'Traccar.view.dialog.SavedCommand',
     removeTitle: Strings.sharedSavedCommand
-
 });
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 156f3ec4..f5ab23d3 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -340,7 +340,7 @@
     "alarmTampering": "Tampering Alarm",
     "alarmRemoving": "Removing Alarm",
     "notificationType": "Type of Notification",
-    "notificationAlways": "Send Always",
+    "notificationAlways": "Apply to All Devices",
     "notificationWeb": "Send via Web",
     "notificationMail": "Send via Mail",
     "notificationSms": "Send via SMS",