"Inherit access rights" option disabled for top level objects (issue #851)

diff --git a/ChangeLog b/ChangeLog
index 0d52572..dc20cf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,11 +15,13 @@
 - Zone ID can be set for agent in SNMP proxy mode
 - Zones has common default proxy node for all protocols
 - Zone's proxy node can be placed inside that zone
+- Built-in superuser account renamed to "system"
+- Default "admin" account now is ordinary member of "Admins" group without built-in privileges
 - Management console
        - New editors for Agent Config Policy and Log Parser Policy. 
        - DCI summary tables with empty menu path not shown in object context menu
        - Fixed glitches in table value view
-- Fixed issues: #92, #906, #909, #942, #959, #992, #999, #1006, #1051, #1096, #1100, #1159, #1187, #1191, #1230, #1237, #1245, #1254, #1261, #1263, #1273, #1275
+- Fixed issues: #92, #851, #906, #909, #942, #959, #992, #999, #1006, #1051, #1096, #1100, #1159, #1187, #1191, #1230, #1237, #1245, #1254, #1261, #1263, #1273, #1275
 
 
 *

diff --git a/src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java b/src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java
index 35da6fe..9b9002d 100644 (file)
--- a/src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java
+++ b/src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java
@@ -228,7 +228,16 @@ public class AccessControl extends PropertyPage
       
       checkInherit = new Button(dialogArea, SWT.CHECK);
       checkInherit.setText(Messages.get().AccessControl_InheritRights);
-      checkInherit.setSelection(object.isInheritAccessRights());
+      if (object.getParentCount() > 0)
+      {
+         checkInherit.setSelection(object.isInheritAccessRights());
+      }
+      else
+      {
+         // For objects without parent "inherit access rights" option is meaningless
+         checkInherit.setSelection(false);
+         checkInherit.setEnabled(false);
+      }
       
                return dialogArea;
        }

diff --git a/webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java b/webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java
index 35da6fe..9b9002d 100644 (file)
--- a/webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java
+++ b/webui/webapp/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java
@@ -228,7 +228,16 @@ public class AccessControl extends PropertyPage
       
       checkInherit = new Button(dialogArea, SWT.CHECK);
       checkInherit.setText(Messages.get().AccessControl_InheritRights);
-      checkInherit.setSelection(object.isInheritAccessRights());
+      if (object.getParentCount() > 0)
+      {
+         checkInherit.setSelection(object.isInheritAccessRights());
+      }
+      else
+      {
+         // For objects without parent "inherit access rights" option is meaningless
+         checkInherit.setSelection(false);
+         checkInherit.setEnabled(false);
+      }
       
                return dialogArea;
        }