modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
| 19 ++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
| 8 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
| 31 ++++------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
| 2
4 files changed, 29 insertions(+), 31 deletions(-)
New commits:
commit 9d8f5bc97d535a3213b56b1bcb28b2be74dab3fe
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Sep 27 19:38:37 2011 -0400
[BZ 737121] fix sorting bug for Type, Children, and Descendants columns on Resource
group list views (
https://bugzilla.redhat.com/show_bug.cgi?id=737121)
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 584e652..17b2b56 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
@@ -18,12 +18,6 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.groups;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.CATEGORY;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.DESCRIPTION;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.NAME;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE;
-
import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -49,6 +43,8 @@ import
org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.*;
+
/**
* @author Joseph Marques
*/
@@ -145,15 +141,14 @@ public class ResourceGroupCompositeDataSource extends
RPCDataSource<ResourceGrou
String nameAttrib = from.getAttribute(NAME.propertyName());
String descriptionAttrib = from.getAttribute(DESCRIPTION.propertyName());
String typeNameAttrib = from.getAttribute(TYPE.propertyName());
- String pluginNameAttrib = from.getAttribute(PLUGIN.propertyName());
- ResourceType rt = null;
ResourceGroup rg = new ResourceGroup(nameAttrib);
rg.setId(idAttrib);
rg.setDescription(descriptionAttrib);
- if (null != typeNameAttrib) {
- rt = new ResourceType();
+ if (typeNameAttrib != null) {
+ ResourceType rt = new ResourceType();
rt.setName(typeNameAttrib);
+ String pluginNameAttrib = from.getAttribute(PLUGIN.propertyName());
rt.setPlugin(pluginNameAttrib);
rg.setResourceType(rt);
}
@@ -183,8 +178,8 @@ public class ResourceGroupCompositeDataSource extends
RPCDataSource<ResourceGrou
record.setAttribute("implicitUp",
String.valueOf(from.getImplicitUp()));
record.setAttribute("implicitDown",
String.valueOf(from.getImplicitDown()));
- record.setAttribute("availabilityChildren",
getExplicitFormatted(from));
- record.setAttribute("availabilityDescendents",
getImplicitFormatted(from));
+ record.setAttribute(AVAIL_CHILDREN.propertyName(), getExplicitFormatted(from));
+ record.setAttribute(AVAIL_DESCENDANTS.propertyName(),
getImplicitFormatted(from));
if (from.getResourceGroup().getResourceType() != null) {
record.setAttribute("resourceType",
from.getResourceGroup().getResourceType());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
index 743db43..c2a93ec 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
@@ -33,11 +33,15 @@ public enum ResourceGroupDataSourceField {
DESCRIPTION("description",
CoreGUI.getMessages().common_title_description()),
- TYPE("typeName", CoreGUI.getMessages().common_title_type()),
+ TYPE("resourceTypeName", CoreGUI.getMessages().common_title_type()),
PLUGIN("pluginName", CoreGUI.getMessages().common_title_plugin()),
- CATEGORY("groupCategory", CoreGUI.getMessages().common_title_category());
+ CATEGORY("groupCategory", CoreGUI.getMessages().common_title_category()),
+
+ AVAIL_CHILDREN("availabilityChildren",
CoreGUI.getMessages().view_inventory_groups_children()),
+
+ AVAIL_DESCENDANTS("availabilityDescendants",
CoreGUI.getMessages().view_inventory_groups_descendants());
/**
* Corresponds to a property name of Resource
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 bf022a0..024dcc5 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
@@ -18,12 +18,6 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.groups;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.CATEGORY;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.DESCRIPTION;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.NAME;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.PLUGIN;
-import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.TYPE;
-
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Alignment;
@@ -59,6 +53,8 @@ import
org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
+import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupDataSourceField.*;
+
/**
* @author Greg Hinkle
* @author Joseph Marques
@@ -105,8 +101,7 @@ public class ResourceGroupListView extends
Table<ResourceGroupCompositeDataSourc
ListGridField idField = new ListGridField("id",
MSG.common_title_id());
idField.setWidth(50);
- ListGridField categoryField = new ListGridField(CATEGORY.propertyName());
- categoryField.setTitle(" ");
+ ListGridField categoryField = new ListGridField(CATEGORY.propertyName(),
CATEGORY.title());
categoryField.setWidth(25);
categoryField.setAlign(Alignment.CENTER);
categoryField.setCellFormatter(new CellFormatter() {
@@ -121,7 +116,7 @@ public class ResourceGroupListView extends
Table<ResourceGroupCompositeDataSourc
categoryField.setHoverCustomizer(new HoverCustomizer() {
@Override
public String hoverHTML(Object value, ListGridRecord record, int rowNum, int
colNum) {
- String categoryName = record.getAttribute(CATEGORY.propertyName());
+ String categoryName = record.getAttribute(CATEGORY.name());
GroupCategory category = GroupCategory.valueOf(categoryName);
String displayName = null;
switch (category) {
@@ -148,21 +143,25 @@ public class ResourceGroupListView extends
Table<ResourceGroupCompositeDataSourc
});
ListGridField descriptionField = new ListGridField(DESCRIPTION.propertyName(),
DESCRIPTION.title());
- descriptionField.setWidth("30%");
+ descriptionField.setWidth("28%");
ListGridField typeNameField = new ListGridField(TYPE.propertyName(),
TYPE.title());
- typeNameField.setWidth("10%");
+ typeNameField.setWidth("14%");
ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(),
PLUGIN.title());
- pluginNameField.setWidth("10%");
+ pluginNameField.setWidth("8%");
- ListGridField availabilityChildrenField = new
ListGridField("availabilityChildren", MSG
- .view_inventory_groups_children(), 120); // 120 due to the html in
ResourceGroupCompositeDataSource.getAlignedAvailabilityResults
+ ListGridField availabilityChildrenField = new
ListGridField(AVAIL_CHILDREN.propertyName(),
+ AVAIL_CHILDREN.title(), 110); // 110 due to the html in
ResourceGroupCompositeDataSource.getAlignedAvailabilityResults
+ availabilityChildrenField.setCanSortClientOnly(true);
+ availabilityChildrenField.setCanGroupBy(false);
availabilityChildrenField.setWrap(false);
availabilityChildrenField.setAlign(Alignment.CENTER);
- ListGridField availabilityDescendantsField = new
ListGridField("availabilityDescendents", MSG
- .view_inventory_groups_descendants(), 120); // 120 due to the html in
ResourceGroupCompositeDataSource.getAlignedAvailabilityResults
+ ListGridField availabilityDescendantsField = new
ListGridField(AVAIL_DESCENDANTS.propertyName(),
+ AVAIL_DESCENDANTS.title(), 110); // 110 due to the html in
ResourceGroupCompositeDataSource.getAlignedAvailabilityResults
+ availabilityDescendantsField.setCanSortClientOnly(true);
+ availabilityDescendantsField.setCanGroupBy(false);
availabilityDescendantsField.setWrap(false);
availabilityDescendantsField.setAlign(Alignment.CENTER);
commit e54d99073bde2530b55107987b0bfd60e3fb9b3d
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Sep 27 19:37:17 2011 -0400
fix typo in comment
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
index 4bf2bae..af2d800 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
@@ -370,7 +370,7 @@ public final class CriteriaQueryGenerator {
/*
* do not prefix the alias when:
*
- * 1) if the suffix is numerical, which allows usto sort by column
ordinal
+ * 1) if the suffix is numerical, which allows us to sort by column
ordinal
* 2) if the user wants full control and has explicitly chosen to disable
alias prepending
*/
boolean doNotPrefixAlias = isNumber(suffix) ||
criteria.hasCustomizedSorting();