modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 3 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 9 ++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 7 ++++--- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1 + 4 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit c76a944d159c23baf04e0967d044504b782b85cd Author: Simeon Pinder spinder@redhat.com Date: Thu Apr 28 16:40:47 2011 -0400
BZ 698607: fix issue with monitor portlet not retrieving details for autogroups and erroneous msg.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java index f4fa675..ee1fbc5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java @@ -121,9 +121,8 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout implement super(locatorId); //figure out which page we're loading String currentPage = History.getToken(); - String[] elements = currentPage.split("/"); this.groupId = groupId; - baseViewPath = elements[0]; + baseViewPath = AbstractActivityView.groupPathLookup(currentPage); }
public GroupConfigurationUpdatesPortlet(String locatorId) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java index 1c5b526..e45fbab 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java @@ -114,10 +114,9 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti super(locatorId); //figure out which page we're loading String currentPage = History.getToken(); - String[] elements = currentPage.split("/"); int groupId = AbstractActivityView.groupIdLookup(currentPage); this.groupId = groupId; - baseViewPath = elements[0]; + baseViewPath = AbstractActivityView.groupPathLookup(currentPage); }
@Override @@ -437,7 +436,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti LocatableDynamicForm row = AbstractActivityView .createEmptyDisplayRow(recentMeasurementsContent .extendLocatorId("None"), - AbstractActivityView.RECENT_MEASUREMENTS_NONE); + AbstractActivityView.RECENT_MEASUREMENTS_GROUP_NONE); column.addMember(row); } else { //insert see more link @@ -454,7 +453,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti LocatableDynamicForm row = AbstractActivityView .createEmptyDisplayRow(recentMeasurementsContent .extendLocatorId("None"), - AbstractActivityView.RECENT_MEASUREMENTS_NONE); + AbstractActivityView.RECENT_MEASUREMENTS_GROUP_NONE); column.addMember(row); } setRefreshing(false); @@ -465,7 +464,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti } } else { LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(recentMeasurementsContent - .extendLocatorId("None"), AbstractActivityView.RECENT_MEASUREMENTS_NONE); + .extendLocatorId("None"), AbstractActivityView.RECENT_MEASUREMENTS_GROUP_NONE); column.addMember(row); setRefreshing(false); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java index c1f1042..cc51b5d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java @@ -95,6 +95,7 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R //retrieve localized text public static String RECENT_MEASUREMENTS = MSG.common_title_recent_measurements(); public static String RECENT_MEASUREMENTS_NONE = MSG.view_resource_inventory_activity_no_recent_metrics(); + public static String RECENT_MEASUREMENTS_GROUP_NONE = MSG.view_group_inventory_activity_no_recent_metrics(); public static String RECENT_ALERTS = MSG.common_title_recent_alerts(); public static String RECENT_ALERTS_NONE = MSG.view_resource_inventory_activity_no_recent_alerts(); public static String RECENT_OOB = MSG.common_title_recent_oob_metrics(); @@ -636,19 +637,19 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R return groupId; }
- /* Utility method to extract groupId from + /* Utility method to extract group base path from current page * */ public static String groupPathLookup(String currentPage) { String groupBasePath = ""; if ((currentPage != null) && (!currentPage.trim().isEmpty())) { String[] elements = currentPage.split("/"); - //process for groups and auto groups Ex. ResourceGroup/10111 or ResourceGroup/AutoCluster/10321 + //process for groups and auto groups Ex. ResourceGroup/10111 , ResourceGroup/AutoCluster/10321 , Resource/AutoGroup/10141 try { Integer.valueOf(elements[1]); groupBasePath = elements[0]; } catch (NumberFormatException nfe) { - groupBasePath = elements[1] + "/" + elements[1]; + groupBasePath = elements[0] + "/" + elements[1]; } } return groupBasePath; 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 01045ce..cf9dbbc 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 @@ -1854,6 +1854,7 @@ 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_inventory_activity_no_recent_metrics=This group has no recent metrics 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}]