[rhq] modules/core modules/enterprise
by mazz
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 12 -
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 | 64 ++++++----
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/util/RPCDataSource.java | 2
6 files changed, 52 insertions(+), 34 deletions(-)
New commits:
commit a0f2d7877d9c606d33b07cfb52ac08dc361badae
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Nov 30 22:54:36 2010 -0500
fix the problem groups view
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
index 835821a..5bd527d 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
@@ -50,7 +50,7 @@ public class ResourceGroupCriteria extends TaggedCriteria {
private Integer filterAutoGroupParentResourceId; // requires overrides
private String filterPluginName; // requires overrides
private GroupCategory filterGroupCategory;
- private Integer filterDownMemberCount; // required overrides
+ private Long filterDownMemberCount; // required overrides
private List<Integer> filterExplicitResourceIds; // requires overrides
private List<Integer> filterImplicitResourceIds; // requires overrides
private ResourceCategory filterExplicitResourceCategory; // requires overrides
@@ -131,7 +131,7 @@ public class ResourceGroupCriteria extends TaggedCriteria {
/**
* Only returns groups with at least this many downed implicit resource members
*/
- public void addFilterDownMemberCount(Integer filterDownMemberCount) {
+ public void addFilterDownMemberCount(Long filterDownMemberCount) {
this.filterDownMemberCount = filterDownMemberCount;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
index 2120978..9221091 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
@@ -235,13 +235,13 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
});
NavigationItem problemGroupsItem = new NavigationItem(PAGE_PROBLEM_GROUPS, ImageManager.getGroupIcon(
- GroupCategory.COMPATIBLE, 0.0d), new ViewFactory() {
+ GroupCategory.MIXED, 0.0d), new ViewFactory() {
public Canvas createView() {
- // TODO: There is no underlying support for this criteria. Also, there should not be an active New
- // button on this page.
- return new ResourceGroupListView(extendLocatorId(PAGE_PROBLEM_GROUPS.getName()), new Criteria(
- "availability", "down"), PAGE_PROBLEM_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(
- GroupCategory.COMPATIBLE, 0.0d));
+ ResourceGroupListView view = new ResourceGroupListView(extendLocatorId(PAGE_PROBLEM_GROUPS.getName()),
+ new Criteria("downMemberCount", "1"), PAGE_PROBLEM_GROUPS.getTitle(), ImageManager
+ .getGroupLargeIcon(GroupCategory.MIXED, 0.0d));
+ view.setShowNewButton(false);
+ return view;
}
});
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 72a73fe..2418ec0 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
@@ -125,7 +125,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
criteria.addFilterName(getFilter(request, NAME.propertyName(), String.class));
criteria.addFilterGroupCategory(getFilter(request, CATEGORY.propertyName(), GroupCategory.class));
- criteria.addFilterDownMemberCount(getFilter(request, "downMemberCount", Integer.class));
+ criteria.addFilterDownMemberCount(getFilter(request, "downMemberCount", Long.class));
criteria.addFilterExplicitResourceIds(getFilter(request, "explicitResourceId", Integer.class));
criteria.addFilterGroupDefinitionId(getFilter(request, "groupDefinitionId", Integer.class));
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 5de3232..6787f55 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
@@ -53,6 +53,9 @@ public class ResourceGroupListView extends Table {
private static final String DEFAULT_TITLE = MSG.view_inventory_groups_resourceGroups();
+ private boolean showDeleteButton = true;
+ private boolean showNewButton = true;
+
public ResourceGroupListView(String locatorId) {
this(locatorId, DEFAULT_TITLE);
}
@@ -72,6 +75,14 @@ public class ResourceGroupListView extends Table {
setDataSource(datasource);
}
+ public void setShowDeleteButton(boolean showDeleteButton) {
+ this.showDeleteButton = showDeleteButton;
+ }
+
+ public void setShowNewButton(boolean showNewButton) {
+ this.showNewButton = showNewButton;
+ }
+
@Override
protected void configureTable() {
ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title(), 250);
@@ -101,36 +112,41 @@ public class ResourceGroupListView extends Table {
setListGridFields(false, nameField, descriptionField, typeNameField, pluginNameField, categoryField,
availabilityChildrenField, availabilityDescendantsField);
- addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_areYouSure(),
- new AbstractTableAction(TableActionEnablement.ANY) {
- public void executeAction(ListGridRecord[] selections, Object actionValue) {
- int[] groupIds = new int[selections.length];
- int index = 0;
- for (ListGridRecord selection : selections) {
- groupIds[index++] = selection.getAttributeAsInt("id");
- }
- ResourceGroupGWTServiceAsync resourceGroupManager = GWTServiceLookup.getResourceGroupService();
-
- resourceGroupManager.deleteResourceGroups(groupIds, new AsyncCallback<Void>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_inventory_groups_deleteFailed(), caught);
+ if (this.showDeleteButton) {
+ addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_areYouSure(),
+ new AbstractTableAction(TableActionEnablement.ANY) {
+ public void executeAction(ListGridRecord[] selections, Object actionValue) {
+ int[] groupIds = new int[selections.length];
+ int index = 0;
+ for (ListGridRecord selection : selections) {
+ groupIds[index++] = selection.getAttributeAsInt("id");
}
+ ResourceGroupGWTServiceAsync resourceGroupManager = GWTServiceLookup.getResourceGroupService();
- public void onSuccess(Void result) {
- CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_inventory_groups_deleteSuccessful(), Severity.Info));
+ resourceGroupManager.deleteResourceGroups(groupIds, new AsyncCallback<Void>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_inventory_groups_deleteFailed(), caught);
+ }
- ResourceGroupListView.this.refresh();
- }
- });
+ public void onSuccess(Void result) {
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_inventory_groups_deleteSuccessful(), Severity.Info));
+
+ ResourceGroupListView.this.refresh();
+ }
+ });
+ }
+ });
+ }
+
+ if (this.showNewButton) {
+ addTableAction(extendLocatorId("New"), MSG.common_button_new(), new AbstractTableAction() {
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ new GroupCreateWizard(ResourceGroupListView.this).startWizard();
}
});
+ }
- addTableAction(extendLocatorId("New"), MSG.common_button_new(), new AbstractTableAction() {
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- new GroupCreateWizard(ResourceGroupListView.this).startWizard();
- }
- });
//adding cell double click handler
getListGrid().addCellDoubleClickHandler(new CellDoubleClickHandler() {
@Override
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 d0ba901..5bbb4d3 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
@@ -121,7 +121,7 @@ public class ResourceGroupsDataSource extends RPCDataSource<ResourceGroup> {
criteria.addFilterName(getFilter(request, NAME.propertyName(), String.class));
criteria.addFilterGroupCategory(getFilter(request, CATEGORY.propertyName(), GroupCategory.class));
- criteria.addFilterDownMemberCount(getFilter(request, "downMemberCount", Integer.class));
+ criteria.addFilterDownMemberCount(getFilter(request, "downMemberCount", Long.class));
criteria.addFilterExplicitResourceIds(getFilter(request, "explicitResourceId", Integer.class));
criteria.addFilterGroupDefinitionId(getFilter(request, "groupDefinitionId", Integer.class));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
index 93d53b3..f40a5df 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
@@ -474,6 +474,8 @@ public abstract class RPCDataSource<T> extends DataSource {
result = (S) strValue;
} else if (type == Integer.class) {
result = (S) Integer.valueOf(strValue);
+ } else if (type == Long.class) {
+ result = (S) Long.valueOf(strValue);
} else if (type.isEnum()) {
result = (S) Enum.valueOf((Class<? extends Enum>) type, strValue);
} else {
13 years, 5 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f5c606fb25d8283f0036674db21de89e3193c5e5
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Nov 30 21:44:53 2010 -0500
have the "view template" link take you directly to the details page of the actual template definition
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
index ca67f56..f27f31a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
@@ -96,7 +96,7 @@ public class ResourceAlertDefinitionsDataSource extends AbstractAlertDefinitions
} else {
if (parentId != null && parentId.intValue() != 0) {
record.setAttribute(FIELD_PARENT, LinkManager.getAdminTemplatesLink() + "/Alert/"
- + this.resource.getResourceType().getId());
+ + this.resource.getResourceType().getId() + "/" + parentId);
record.setLinkText(MSG.view_alert_definition_for_type());
} else {
record.setAttribute(FIELD_PARENT, "#ResourceGroup/" + groupAlertDefinition.getResourceGroup().getId()
13 years, 5 months