modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit c45b0da4437328530ac99cae0044c32c882526b0 Merge: b8dc201 054b9b6 Author: Ian Springer ian.springer@redhat.com Date: Mon Jul 11 15:06:43 2011 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit b8dc20126741ce3670ead2da43ff40c515bc4a15 Author: Ian Springer ian.springer@redhat.com Date: Mon Jul 11 15:03:50 2011 -0400
don't display Monitoring tab for a compat group that has no metrics defined
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 e980129..88d754b 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 @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2011 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -261,9 +261,11 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource }
private void updateMonitoringTab(final int groupId, GroupCategory groupCategory, Set<ResourceTypeFacet> facets) { - boolean visible; ViewFactory viewFactory; - if (updateTab(this.monitoringTab, groupCategory == GroupCategory.COMPATIBLE, true)) { + // TODO: Once we add an Availability subtab, the Monitoring tab will always be visible, even for groups with + // no metrics. + boolean visible = hasMetricsOfType(this.groupComposite, null); + if (updateTab(this.monitoringTab, visible, true)) { visible = hasMetricsOfType(this.groupComposite, DataType.MEASUREMENT); viewFactory = (!visible) ? null : new ViewFactory() { @Override
rhq-commits@lists.fedorahosted.org