modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EditableFormItem.java | 4 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java | 15 +++++++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java | 8 +++++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2 + 5 files changed, 27 insertions(+), 3 deletions(-)
New commits: commit ffd054195e9efc6946c5824a8fc2e80c04de6535 Author: John Mazzitelli mazz@redhat.com Date: Sat Dec 11 16:10:16 2010 -0500
BZ 661887 we can now change the recursive setting for groups via the GWT group summary view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java index f48fd96..17c0f6c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java @@ -69,4 +69,5 @@ public interface ResourceGroupGWTService extends RemoteService {
void updateResourceGroup(ResourceGroup group, boolean updateMembership);
+ void setRecursive(int groupId, boolean isRecursive) throws Exception; } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java index 83b8831..94fecf9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java @@ -179,7 +179,20 @@ public class GeneralProperties extends LocatableVLayout { recursiveItem.setValueEditedHandler(new ValueEditedHandler() { @Override public void editedValue(Object newValue) { - CoreGUI.getMessageCenter().notify(new Message("TODO: set recursive flag to=" + newValue)); + boolean isRecursive = (newValue != null) ? ((Boolean) newValue).booleanValue() : false; + resourceGroupService.setRecursive(group.getId(), isRecursive, new AsyncCallback<Void>() { + @Override + public void onSuccess(Void result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_group_detail_recursiveChange(group.getName()))); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_group_detail_failRecursiveChange(String.valueOf(group.getName()))); + } + }); } }); recursiveItem.setValue((group.isRecursive()) ? MSG.common_val_yes_lower() : MSG.common_val_no_lower()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java index c0ba7b0..2ef7eec 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java @@ -172,4 +172,12 @@ public class ResourceGroupGWTServiceImpl extends AbstractGWTServiceImpl implemen } }
+ @Override + public void setRecursive(int groupId, boolean isRecursive) throws Exception { + try { + groupManager.setRecursive(getSessionSubject(), groupId, isRecursive); + } catch (Throwable t) { + throw new RuntimeException(ThrowableUtil.getAllMessages(t)); + } + } } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index cf0ce57..defb4a1 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1389,6 +1389,8 @@ view_dynagroup_permDenied = You do not have permission to view group definitions view_dynagroup_definitions = DynaGroup Definitions view_group_detail_failLoad = Failed to load group for group with ID [{0}] view_group_detail_failLoadComp = Failed to load group composite for group with ID [{0}] +view_group_detail_recursiveChange = You successfully changed the recursive setting for group [{0}] +view_group_detail_failRecursiveChange = Failed to update the recursive setting for group [{0}] view_group_membership_failFetch = Failed to fetch Resource Group view_group_membership_saveFailure = Failed to update membership of group [{0}] view_group_membership_saveSuccessful = You have updated the membership of group [{0}]
commit 2cf91834c144eb4ca30294b3a8d8d01d94847d39 Author: John Mazzitelli mazz@redhat.com Date: Sat Dec 11 16:05:37 2010 -0500
we want to give the handler the actual value coming from the edit item, not the converted value that is being set on the static item
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EditableFormItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EditableFormItem.java index 74838d5..8727538 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EditableFormItem.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EditableFormItem.java @@ -294,9 +294,9 @@ public class EditableFormItem extends CanvasItem { * @param newValue the new value just accepted by the user and validated by the system */ protected void setApprovedNewValue(Object newValue) { - Object convertedValue = setStaticItemValue(this.staticItem, newValue); + setStaticItemValue(this.staticItem, newValue); if (this.valueEditedHandler != null) { - this.valueEditedHandler.editedValue(convertedValue); + this.valueEditedHandler.editedValue(newValue); } }
rhq-commits@lists.fedorahosted.org