modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
| 29 ++++++----
modules/enterprise/gui/coregui/src/main/webapp/images/global/permission_checked_disabled_11.png
|binary
2 files changed, 20 insertions(+), 9 deletions(-)
New commits:
commit a4c0b1aaf0dbbc3d1a82292534eb224993fb2378
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Jan 31 12:29:47 2012 -0800
[BZ734162] Improvement: (UXD) Non-editable checkbox in Roles is confusing. Added
non-enabled checkbox for when read-only checkbox is checked. Kind of a third state -
checked, not checked and checked read-only(disabled check).
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 36c0c3d..1ebd2a2 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
@@ -160,7 +160,7 @@ public class PermissionsEditor extends LocatableVStack {
descriptionField.setWrap(true);
final ListGridField authorizedField =
createAuthorizedField("authorized",
- MSG.view_adminRoles_permissions_isAuthorized(), "name", grid);
+ MSG.view_adminRoles_permissions_isAuthorized(), "name", grid,
false);
grid.setFields(iconField, displayNameField, authorizedField, descriptionField);
@@ -203,9 +203,9 @@ public class PermissionsEditor extends LocatableVStack {
descriptionField.setWrap(true);
ListGridField readField = createAuthorizedField("readAuthorized",
MSG.view_adminRoles_permissions_isRead(),
- "readName", grid);
+ "readName", grid, true);
ListGridField writeField = createAuthorizedField("writeAuthorized",
MSG.view_adminRoles_permissions_isWrite(),
- "writeName", grid);
+ "writeName", grid, false);
grid.setFields(iconField, displayNameField, readField, writeField,
descriptionField);
@@ -298,24 +298,30 @@ public class PermissionsEditor extends LocatableVStack {
return grid;
}
- private ListGridField createAuthorizedField(String name, String title, final String
nameField, final ListGrid grid) {
+ private ListGridField createAuthorizedField(String name, String title, final String
nameField, final ListGrid grid, boolean readOnlyColumn) {
final ListGridField authorizedField = new ListGridField(name, title, 65);
// Show images rather than true/false.
authorizedField.setType(ListGridFieldType.IMAGE);
authorizedField.setImageSize(11);
+
LinkedHashMap<String, String> valueMap = new LinkedHashMap<String,
String>(2);
- valueMap.put(Boolean.TRUE.toString(),
"global/permission_enabled_11.png");
- valueMap.put(Boolean.FALSE.toString(),
"global/permission_disabled_11.png");
+ // set the proper images different for read-only column
+ if(readOnlyColumn){
+ valueMap.put(Boolean.TRUE.toString(),
"global/permission_checked_disabled_11.png");
+ valueMap.put(Boolean.FALSE.toString(),
"global/permission_disabled_11.png");
+ }else {
+ valueMap.put(Boolean.TRUE.toString(),
"global/permission_enabled_11.png");
+ valueMap.put(Boolean.FALSE.toString(),
"global/permission_disabled_11.png");
+ }
+ authorizedField.setValueMap(valueMap);
+ authorizedField.setCanEdit(true);
CheckboxItem editor = new CheckboxItem();
authorizedField.setEditorType(editor);
if (!this.isReadOnly) {
Log.debug("Non-Readonly field " +name);
- authorizedField.setCanEdit(true);
- valueMap.put(Boolean.TRUE.toString(),
"global/permission_enabled_11.png");
- valueMap.put(Boolean.FALSE.toString(),
"global/permission_disabled_11.png");
grid.setEditEvent(ListGridEditEvent.CLICK);
final Record[] recordBeingEdited = { null };
authorizedField.addRecordClickHandler(new RecordClickHandler() {
@@ -358,14 +364,7 @@ public class PermissionsEditor extends LocatableVStack {
}
}
});
- } else {
- Log.debug("Readonly field " +name);
- authorizedField.setCanEdit(false);
- // used different image for read-only
- valueMap.put(Boolean.TRUE.toString(),
"global/permission_checked_disabled_11.png");
- valueMap.put(Boolean.FALSE.toString(),
"global/permission_disabled_11.png");
}
- authorizedField.setValueMap(valueMap);
return authorizedField;
}
commit c37ea2641b13e7cfdb3f939e0b916916caa3d5fe
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Jan 31 11:00:40 2012 -0800
[BZ734162] Improvement: (UXD) Non-editable checkbox in Roles is confusing.
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 2ca1d73..36c0c3d 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
@@ -24,6 +24,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
+import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.JavaScriptObject;
import com.smartgwt.client.core.RefDataClass;
import com.smartgwt.client.data.Record;
@@ -33,6 +34,7 @@ import com.smartgwt.client.types.ListGridEditEvent;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.util.JSOHelper;
import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.CheckboxItem;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
@@ -305,13 +307,16 @@ public class PermissionsEditor extends LocatableVStack {
LinkedHashMap<String, String> valueMap = new LinkedHashMap<String,
String>(2);
valueMap.put(Boolean.TRUE.toString(),
"global/permission_enabled_11.png");
valueMap.put(Boolean.FALSE.toString(),
"global/permission_disabled_11.png");
- authorizedField.setValueMap(valueMap);
+
+ CheckboxItem editor = new CheckboxItem();
+ authorizedField.setEditorType(editor);
if (!this.isReadOnly) {
+ Log.debug("Non-Readonly field " +name);
authorizedField.setCanEdit(true);
+ valueMap.put(Boolean.TRUE.toString(),
"global/permission_enabled_11.png");
+ valueMap.put(Boolean.FALSE.toString(),
"global/permission_disabled_11.png");
grid.setEditEvent(ListGridEditEvent.CLICK);
- CheckboxItem editor = new CheckboxItem();
- authorizedField.setEditorType(editor);
final Record[] recordBeingEdited = { null };
authorizedField.addRecordClickHandler(new RecordClickHandler() {
public void onRecordClick(RecordClickEvent event) {
@@ -353,7 +358,14 @@ public class PermissionsEditor extends LocatableVStack {
}
}
});
+ } else {
+ Log.debug("Readonly field " +name);
+ authorizedField.setCanEdit(false);
+ // used different image for read-only
+ valueMap.put(Boolean.TRUE.toString(),
"global/permission_checked_disabled_11.png");
+ valueMap.put(Boolean.FALSE.toString(),
"global/permission_disabled_11.png");
}
+ authorizedField.setValueMap(valueMap);
return authorizedField;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/webapp/images/global/permission_checked_disabled_11.png
b/modules/enterprise/gui/coregui/src/main/webapp/images/global/permission_checked_disabled_11.png
new file mode 100644
index 0000000..00bba51
Binary files /dev/null and
b/modules/enterprise/gui/coregui/src/main/webapp/images/global/permission_checked_disabled_11.png
differ