modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
| 5 ++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
| 2 ++
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 6773ca8922f29b95bf5b286f2f8a8330493d169e
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Apr 4 14:48:13 2011 -0400
fix bug in checkboxes for implied-read resource perms in permissions editor
(
https://bugzilla.redhat.com/show_bug.cgi?id=683852)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
index 447659b..506850a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.admin.roles;
import java.util.ArrayList;
import java.util.EnumSet;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
@@ -73,7 +72,8 @@ public class PermissionsEditor extends LocatableVStack {
this.roleEditView = roleEditView;
this.isReadOnly = isReadOnly;
- this.selectedPermissions = new HashSet<Permission>();
+ // Default permission set
+ this.selectedPermissions = EnumSet.of(Permission.VIEW_RESOURCE);
setWidth("95%");
setHeight100();
@@ -337,7 +337,6 @@ public class PermissionsEditor extends LocatableVStack {
Permission permission = Permission.valueOf(permissionName);
if (permission == Permission.VIEW_RESOURCE) {
event.getItem().setValue(true);
- event.getItem().disable();
String permissionDisplayName =
record.getAttribute("displayName");
Message message = new Message(
MSG.view_adminRoles_permissions_readAccessImplied(permissionDisplayName),
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
index 3af67b6..fd2a086 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
@@ -251,6 +251,8 @@ public class RolesDataSource extends RPCDataSource<Role,
RoleCriteria> {
public static Set<Permission> toPermissionSet(Record[] permissionRecords) {
Set<Permission> permissions = new HashSet<Permission>();
+ // VIEW_RESOURCE is implied, so make sure it's always in the returned Set.
+ permissions.add(Permission.VIEW_RESOURCE);
for (Record permissionRecord : permissionRecords) {
String permissionName = permissionRecord.getAttribute("name");
Permission permission = Permission.valueOf(permissionName);