modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java
| 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
| 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
| 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
| 15 ++++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
| 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java
| 8 ++---
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
| 2 -
7 files changed, 18 insertions(+), 15 deletions(-)
New commits:
commit ae8dfb3eaa8512174d536795aa3f17f5ba2e444b
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Oct 20 15:05:40 2010 -0400
fix a bug i introduced earlier today that was causing the group list views to fail to
display; make titles of group list views prettier (separate words rather than camel case)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java
index e198fc0..4583a4a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java
@@ -89,7 +89,7 @@ public class GroupConfigurationEditor extends ConfigurationEditor {
if (isAggregateProperty(propertySimple)) {
// Create the "MEMBER VALUES DIFFER" label that is displayed when
member values are heterogeneous.
final StaticTextItem staticItem = new StaticTextItem();
- staticItem.setValue("MEMBER VALUES DIFFER");
+ staticItem.setValue("member values differ");
staticItem.setTextBoxStyle("InlineNote");
staticItem.setShowTitle(false);
staticItem.setTooltip("Member values differ - click icon to edit
them.");
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
index bdb1160..92fc25d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
@@ -166,7 +166,7 @@ public class GWTServiceLookup {
String sessionId = UserSessionManager.getSessionId();
if (sessionId != null) {
- Log.info("SessionRpcRequestBuilder is adding sessionId to request:
" + sessionId);
+ Log.debug("SessionRpcRequestBuilder is adding sessionId to request:
" + sessionId);
rb.setHeader(UserSessionManager.SESSION_NAME, sessionId);
} else {
Log.error("SessionRpcRequestBuilder constructed without a value for
" + UserSessionManager.SESSION_NAME);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index 2b5097f..b2fea0a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -157,7 +157,7 @@ public class ResourceGroupCompositeDataSource extends
RPCDataSource<ResourceGrou
record.setAttribute("id", from.getResourceGroup().getId());
record.setAttribute("name", from.getResourceGroup().getName());
record.setAttribute("description",
from.getResourceGroup().getDescription());
- record.setAttribute("category",
from.getResourceGroup().getGroupCategory());
+ record.setAttribute("category",
from.getResourceGroup().getGroupCategory().name());
record.setAttribute("explicitUp",
String.valueOf(from.getExplicitUp()));
record.setAttribute("explicitDown",
String.valueOf(from.getExplicitDown()));
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 6aa4e65..32aabb0 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -26,6 +26,7 @@ import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -65,8 +66,10 @@ public class ResourceGroupListView extends Table {
protected void configureTable() {
ListGridField nameField = new ListGridField("name", "Name",
300);
nameField.setCellFormatter(new CellFormatter() {
- public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
- return "<a href=\"#ResourceGroup/" +
listGridRecord.getAttribute("id") + "\">" + o +
"</a>";
+ public String format(Object value, ListGridRecord record, int i, int i1) {
+ String groupId = record.getAttribute("id");
+ String groupUrl =
LinkManager.getResourceGroupLink(Integer.valueOf(groupId));
+ return "<a href=\"" + groupUrl +
"\">" + value + "</a>";
}
});
@@ -79,12 +82,12 @@ public class ResourceGroupListView extends Table {
availabilityChildrenField.setWrap(false);
availabilityChildrenField.setAlign(Alignment.CENTER);
- ListGridField availabilityDescendentsField = new
ListGridField("availabilityDescendents", "Descendents", 100);
- availabilityDescendentsField.setWrap(false);
- availabilityDescendentsField.setAlign(Alignment.CENTER);
+ ListGridField availabilityDescendantsField = new
ListGridField("availabilityDescendents", "Descendants", 100);
+ availabilityDescendantsField.setWrap(false);
+ availabilityDescendantsField.setAlign(Alignment.CENTER);
getListGrid().setFields(nameField, descriptionField, typeNameField,
pluginNameField, categoryField,
- availabilityChildrenField, availabilityDescendentsField);
+ availabilityChildrenField, availabilityDescendantsField);
addTableAction(extendLocatorId("Delete"), "Delete",
Table.SelectionEnablement.ANY,
"Delete the selected resource groups?", new TableAction() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
index e0778bb..3f6e197 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
@@ -152,7 +152,7 @@ public class ResourceGroupsDataSource extends
RPCDataSource<ResourceGroup> {
record.setAttribute("id", from.getId());
record.setAttribute("name", from.getName());
record.setAttribute("description", from.getDescription());
- record.setAttribute("category", from.getGroupCategory());
+ record.setAttribute("category", from.getGroupCategory().name());
if (from.getResourceType() != null) {
record.setAttribute("resourceType", from.getResourceType());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java
index fcef030..dee71d2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java
@@ -266,19 +266,19 @@ public class InventoryView extends LocatableHLayout implements
BookmarkableView
} else if (GROUPS_SECTION_VIEW_ID.equals(sectionName)) {
if (PAGE_COMPATIBLE_GROUPS.equals(pageName)) {
content = new
ResourceGroupListView(extendLocatorId("Compatible"), new
Criteria("category",
- GroupCategory.COMPATIBLE.name()), PAGE_COMPATIBLE_GROUPS,
"types/Cluster_up_24.png");
+ GroupCategory.COMPATIBLE.name()), "Compatible Groups",
"types/Cluster_up_24.png");
} else if (PAGE_MIXED_GROUPS.equals(pageName)) {
content = new ResourceGroupListView(extendLocatorId("Mixed"),
new Criteria("category",
- GroupCategory.MIXED.name()), PAGE_MIXED_GROUPS,
"types/Group_up_24.png");
+ GroupCategory.MIXED.name()), "Mixed Groups",
"types/Group_up_24.png");
} else if (PAGE_GROUP_DEFINITIONS.equals(pageName)) {
content = new
GroupDefinitionListView(extendLocatorId("Definitions"),
"types/GroupDefinition_16.png");
} else if (PAGE_PROBLEM_GROUPS.equals(pageName)) {
//TODO - there is no underlying support for this criteria. Also, there
should not be an active
// new button on this page.
content = new
ResourceGroupListView(extendLocatorId("DownGroups"),
- new Criteria("availability", "down"),
PAGE_PROBLEM_GROUPS, "types/Cluster_down_16.png");
+ new Criteria("availability", "down"),
"Problem Groups", "types/Cluster_down_16.png");
} else { // selected the Inventory node itself
- content = new
ResourceGroupListView(extendLocatorId("AllGroups"), null, PAGE_GROUPS,
+ content = new
ResourceGroupListView(extendLocatorId("AllGroups"), null, "All
Groups",
"types/Cluster_up_24.png",
"types/Group_up_24.png");
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
index d60a616..0c5c221 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
@@ -387,7 +387,7 @@ a:hover {
}
.InlineNote {
- color: #511;
+ color: #C22;
}
.log-panel {