- Pass selfEdit parameter to UserDialog

- Group Geofence fields

1 files changed, 5 insertions, 6 deletions

diff --git a/web/app/view/UserDialogController.js b/web/app/view/UserDialogController.js
index d187dec0..f001dead 100644
--- a/web/app/view/UserDialogController.js
+++ b/web/app/view/UserDialogController.js
@@ -19,16 +19,15 @@ Ext.define('Traccar.view.UserDialogController', {
     extend: 'Traccar.view.MapPickerDialogController',
     alias: 'controller.userDialog',
 
-    onShow: function () {
+    init: function () {
         if (Traccar.app.getUser().get('admin')) {
-            this.lookupReference('adminField').setHidden(false);
+            this.lookupReference('adminField').setDisabled(false);
             this.lookupReference('deviceLimitField').setDisabled(false);
             this.lookupReference('userLimitField').setDisabled(false);
         }
-        if (Traccar.app.getUser().get('admin') ||
-                Traccar.app.getUser().getId() !== this.getView().down('form').getRecord().getId()) {
-            this.lookupReference('readonlyField').setHidden(false);
-            this.lookupReference('disabledField').setHidden(false);
+        if (Traccar.app.getUser().get('admin') || !this.getView().selfEdit) {
+            this.lookupReference('readonlyField').setDisabled(false);
+            this.lookupReference('disabledField').setDisabled(false);
             this.lookupReference('expirationTimeField').setDisabled(false);
             this.lookupReference('deviceReadonlyField').setDisabled(false);
         }