modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit 96e0b10bc8c6f02608c744a8741165d10f881af4 Author: John Sanda jsanda@redhat.com Date: Wed Oct 20 11:20:39 2010 -0400
Replacing call to finder method that has been removed in favor of criteria query
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp index 2cc3da3..173fe16 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp @@ -7,6 +7,7 @@ <%@ page import="org.rhq.core.domain.util.PageControl" %> <%@ page import="org.rhq.core.domain.util.PageList" %> <%@ page import="org.rhq.core.domain.util.PageOrdering" %> +<%@ page import="org.rhq.core.domain.criteria.AlertCriteria" %> <%@ page import="org.rhq.enterprise.gui.common.tag.FunctionTagLibrary" %> <%@ page import="org.rhq.enterprise.gui.legacy.ParamConstants" %> <%@ page import="org.rhq.enterprise.gui.legacy.WebUser" %> @@ -29,8 +30,14 @@
PageControl pc = new PageControl(0, 100); pc.setPrimarySortOrder(PageOrdering.DESC); - PageList<Alert> alerts = alertManager.findAlerts(resourceId, null, null, begin, end, pc);
+ AlertCriteria criteria = new AlertCriteria(); + criteria.addFilterResourceIds(resourceId); + criteria.addFilterStartTime(begin); + criteria.addFilterEndTime(end); + criteria.setPageControl(pc); + + PageList<Alert> alerts = alertManager.findAlertsByCriteria(user.getSubject(), criteria); %>
{ "events":