modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java | 18 +++++++-- modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml | 19 +++------- 2 files changed, 22 insertions(+), 15 deletions(-)
New commits: commit 204c6b7de81df429eae5a506c36a84f0ddb7bdc2 Merge: e09efb0... 2ae22a1... Author: Partha Aji paji@redhat.com Date: Mon Feb 22 13:06:45 2010 -0500
Merge branch 'linux-config' into ldap
commit 2ae22a1875e208342ef96cf98825ad31dd01b04f Author: Lukas Krejci lkrejci@redhat.com Date: Mon Feb 22 16:39:30 2010 +0100
BZ 565910 - Resource group summary pane uses resource names disambiguation.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java index 970d2af..ff35220 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java @@ -26,9 +26,11 @@ import org.rhq.core.domain.resource.composite.ResourceWithAvailability; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; +import org.rhq.core.util.IntExtractor; import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; import org.rhq.enterprise.gui.common.paging.PageControlView; import org.rhq.enterprise.gui.common.paging.PagedListDataModel; +import org.rhq.enterprise.gui.common.paging.ResourceNameDisambiguatingPagedListDataModel; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; @@ -36,6 +38,12 @@ import org.rhq.enterprise.server.util.LookupUtil; public class ResourceGroupSummaryUIBean extends PagedDataTableUIBean { public static final String MANAGED_BEAN_NAME = "ResourceGroupSummaryUIBean";
+ private static final IntExtractor<ResourceWithAvailability> RESOURCE_ID_EXTRACTOR = new IntExtractor<ResourceWithAvailability>() { + public int extract(ResourceWithAvailability object) { + return object.getResource().getId(); + } + }; + @Override public DataModel getDataModel() { if (dataModel == null) { @@ -46,15 +54,15 @@ public class ResourceGroupSummaryUIBean extends PagedDataTableUIBean { return dataModel; }
- protected class ListResourceGroupMembersDataModel extends PagedListDataModel<ResourceWithAvailability> { + protected class ListResourceGroupMembersDataModel extends ResourceNameDisambiguatingPagedListDataModel<ResourceWithAvailability> { private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
public ListResourceGroupMembersDataModel(PageControlView view, String beanName) { - super(view, beanName); + super(view, beanName, true); }
@Override - public PageList<ResourceWithAvailability> fetchPage(PageControl pageControl) { + public PageList<ResourceWithAvailability> fetchDataForPage(PageControl pageControl) { Subject subject = EnterpriseFacesContextUtility.getSubject(); ResourceGroup resourceGroup = EnterpriseFacesContextUtility.getResourceGroup();
@@ -64,6 +72,10 @@ public class ResourceGroupSummaryUIBean extends PagedDataTableUIBean {
return results; } + + protected IntExtractor<ResourceWithAvailability> getResourceIdExtractor() { + return RESOURCE_ID_EXTRACTOR; + } }
@Override diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml index 8fd84d9..200a1ed 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml @@ -180,22 +180,17 @@ groupId - the group id of the Group being accessed </f:facet>
<h:outputLink value="#{onf:getDefaultResourceTabURL()}"> - <f:param name="id" value="#{resourceWithAvailability.resource.id}"/> - <h:outputText value="#{resourceWithAvailability.resource.name}"/> + <f:param name="id" value="#{resourceWithAvailability.original.resource.id}"/> + <h:outputText value="#{resourceWithAvailability.original.resource.name}"/> </h:outputLink> </rich:column>
rich:column <f:facet name="header"> - <onc:sortableColumnHeader sort="parent.name"> - <h:outputText styleClass="headerText" value="Parent"/> - </onc:sortableColumnHeader> + <h:outputText styleClass="headerText" value="Parent"/> </f:facet>
- <h:outputLink value="#{onf:getDefaultResourceTabURL()}"> - <f:param name="id" value="#{resourceWithAvailability.parent.id}"/> - <h:outputText value="#{resourceWithAvailability.parent.name}"/> - </h:outputLink> + <onc:resourcePartialLineage parents="#{resourceWithAvailability.parents}"/> </rich:column>
@@ -207,11 +202,11 @@ groupId - the group id of the Group being accessed </f:facet>
<h:graphicImage value="/images/icons/availability_green_16.png" alt="Up" title="Up" - rendered="#{resourceWithAvailability.availability == 'UP'}"/> + rendered="#{resourceWithAvailability.original.availability == 'UP'}"/> <h:graphicImage value="/images/icons/availability_red_16.png" alt="Down" title="Down" - rendered="#{resourceWithAvailability.availability == 'DOWN'}"/> + rendered="#{resourceWithAvailability.original.availability == 'DOWN'}"/> <h:graphicImage value="/images/icons/availability_grey_16.png" alt="Unknown" title="Unknown" - rendered="#{resourceWithAvailability.availability == null}"/> + rendered="#{resourceWithAvailability.original.availability == null}"/> </rich:column>
<f:facet name="footer">
rhq-commits@lists.fedorahosted.org