modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
| 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
New commits:
commit be33092a99dac1fa9f51d74b5237be27b3ff67a3
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Fri Mar 4 13:50:56 2011 -0500
copy/paste bug with Group Activity. Using wrong id in query.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
index 27dfc22..b692f71 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
@@ -36,7 +36,6 @@ import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.alert.Alert;
-import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate;
import org.rhq.core.domain.content.InstalledPackageHistory;
@@ -129,19 +128,12 @@ public class ActivityView extends AbstractActivityView {
*/
private void getRecentAlerts() {
final int groupId = this.groupComposite.getResourceGroup().getId();
- Integer[] filterGroupAlertDefinitionIds;
- Set<AlertDefinition> alertDefinitions =
this.groupComposite.getResourceGroup().getAlertDefinitions();
- filterGroupAlertDefinitionIds = new Integer[alertDefinitions.size()];
- int i = 0;
- for (AlertDefinition def : alertDefinitions) {
- filterGroupAlertDefinitionIds[i++] = def.getId();
- }
//fetches last five alerts for this resource
AlertCriteria criteria = new AlertCriteria();
PageControl pageControl = new PageControl(0, 5);
pageControl.initDefaultOrderingField("ctime", PageOrdering.DESC);
criteria.setPageControl(pageControl);
- criteria.addFilterGroupAlertDefinitionIds(filterGroupAlertDefinitionIds);
+ criteria.addFilterResourceGroupIds(groupId);
GWTServiceLookup.getAlertService().findAlertsByCriteria(criteria, new
AsyncCallback<PageList<Alert>>() {
@Override
public void onSuccess(PageList<Alert> result) {
Show replies by date