Update UserDialog.java

vitalidze · Aug 31, 2015 · cd73817 · cd73817
1 parent 8a7a7c8
commit cd73817
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/org/traccar/web/client/view/UserDialog.java b/src/main/java/org/traccar/web/client/view/UserDialog.java
@@ -119,7 +119,6 @@ public interface UserHandler {
 
     public UserDialog(User user, UserHandler userHandler) {
         this.userHandler = userHandler;
-
         // notification types grid
         IdentityValueProvider<DeviceEventType> identity = new IdentityValueProvider<DeviceEventType>();
         final CheckBoxSelectionModel<DeviceEventType> selectionModel = new CheckBoxSelectionModel<DeviceEventType>(identity);
@@ -152,15 +151,20 @@ public String getValue(DeviceEventType object) {
             grid.getSelectionModel().select(deviceEventType, true);
         }
 
-        if (ApplicationContext.getInstance().getUser().getAdmin()) {
+        if (ApplicationContext.getInstance().getUser().getAdmin() || ApplicationContext.getInstance().getUser().getManager()) {
             admin.setEnabled(true);
-        }
-
-        if (ApplicationContext.getInstance().getUser().getAdmin() ||
-            ApplicationContext.getInstance().getUser().getManager()) {
             manager.setEnabled(true);
+            readOnly.setEnabled(true);
+            expirationDate.setEnabled(true);
+            maxNumOfDevices.setEnabled(true);
+        }
+        else {
+            manager.setEnabled(false);
+            admin.setEnabled(false);
+            readOnly.setEnabled(false);
+            expirationDate.setEnabled(false);
+            maxNumOfDevices.setEnabled(false);
         }
-
         email.addValidator(new RegExValidator(".+@.+\\.[a-z]+", i18n.invalidEmail()));
 
         driver.initialize(this);