modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
| 11 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
| 9 ++++++--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 3 ++
3 files changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 9bde193a96ba2ee92f23f25970a05baf12dd64ff
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 24 17:25:31 2010 -0500
Fixed issue with the Inventory->Membership subtab for AutoGroups.
Basically, that subtab (and future button) should not be visible for
AutoGroups. A user should not be able to alter AG membership.
Also added some missing I18N props for messages sent to the ErrorHandler.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 8fa66f3..9fdd4cc 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -279,10 +279,11 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
updateSubTab(this.inventoryTab, this.inventoryConnHistory, new
HistoryGroupPluginConfigurationView(
this.inventoryConnHistory.extendLocatorId("View"),
this.groupComposite), facets
.contains(ResourceTypeFacet.PLUGIN_CONFIGURATION), true);
- enabled = globalPermissions.contains(Permission.MANAGE_INVENTORY);
+ visible = !isAutoGroup();
+ enabled = visible &&
globalPermissions.contains(Permission.MANAGE_INVENTORY);
canvas = (enabled) ? new
ResourceGroupMembershipView(this.inventoryMembership.extendLocatorId("View"),
groupId)
: null;
- updateSubTab(this.inventoryTab, this.inventoryMembership, canvas, true,
enabled);
+ updateSubTab(this.inventoryTab, this.inventoryMembership, canvas, visible,
enabled);
if (updateTab(this.operationsTab, groupCategory == GroupCategory.COMPATIBLE
&& facets.contains(ResourceTypeFacet.OPERATION), true)) {
@@ -347,14 +348,14 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
GWTServiceLookup.getResourceGroupService().findResourceGroupCompositesByCriteria(criteria,
new AsyncCallback<PageList<ResourceGroupComposite>>() {
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- "Failed to load group composite for group with id " +
groupId, caught);
+
CoreGUI.getErrorHandler().handleError(MSG.view_group_detail_failLoadComp(String.valueOf(groupId)),
+ caught);
}
public void onSuccess(PageList<ResourceGroupComposite> result) {
if (result.isEmpty()) {
CoreGUI.getErrorHandler().handleError(
- "Failed to load group composite for group with id "
+ groupId);
+
MSG.view_group_detail_failLoadComp(String.valueOf(groupId)));
} else {
groupComposite = result.get(0);
loadResourceType(groupComposite, viewPath);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
index 333fce6..a623c4b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
@@ -69,7 +69,9 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
public ResourceGroupTitleBar(String locatorId, boolean isAutoGroup) {
super(locatorId);
+
this.isAutoGroup = isAutoGroup;
+
setWidth100();
setHeight(30);
setPadding(5);
@@ -113,7 +115,8 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
public void onSuccess(PageList<ResourceGroupComposite> result) {
if (result == null || result.size() != 1) {
CoreGUI.getErrorHandler().handleError(
- "Failed to get general info on group [" +
group.getName() + "]");
+ MSG.view_titleBar_group_failInfo(group.getName(), String
+ .valueOf(ResourceGroupTitleBar.this.group.getId())));
return;
}
generalProperties = new
GeneralProperties(extendLocatorId("genProps"), result.get(0));
@@ -139,7 +142,9 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Cannot load group
properties info", caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_titleBar_group_failInfo(group.getName(), String
+ .valueOf(ResourceGroupTitleBar.this.group.getId())),
caught);
}
});
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 4a18c52..65a5886 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
@@ -1226,6 +1226,7 @@ view_titleBar_common_removedFav=You have removed [{0}] as one of
your favorites~
view_titleBar_common_addedFav=You have added [{0}] as a favorite~
view_titleBar_common_removedFavFailure=Failed to remove [{0}] as one of your favorites~
view_titleBar_common_addedFavFailure=Failed to add [{0}] as a favorite~
+view_titleBar_group_failInfo = Failed to get general info on group [{0}] with ID [{1}]~
view_dynagroup_expressionSet=Expression Set~
view_dynagroup_recalculationInterval=Recalculation Interval~
view_dynagroup_lastCalculationTime=Last Calculation Time~
@@ -1254,6 +1255,8 @@ view_dynagroup_loadDefinitionMissing=There is no group definition
with the ID of
view_dynagroup_permUnknown=Could not determine if you have the proper permissions -
access is denied~
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_membership_saveFailure=Failed to update membership of group [{0}]~
view_group_membership_saveSuccessful=You have updated the membership of group [{0}]~
view_group_resConfig_edit_saveTooltip=Update the configurations of all group members~
Show replies by date