diff --git a/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/AlarmNcsFilterCallback.java b/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/AlarmNcsFilterCallback.java
new file mode 100644
index 0000000..a33c784
--- /dev/null
+++ b/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/AlarmNcsFilterCallback.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2015 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2015 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.web.controller.ncs;
+
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.opennms.web.filter.Filter;
+import org.opennms.web.tags.filters.AbstractFilterCallback;
+
+public class AlarmNcsFilterCallback extends AbstractFilterCallback {
+ public AlarmNcsFilterCallback(ServletContext servletContext) {
+ super(servletContext);
+ }
+
+ @Override
+ protected String getIndividualFilterString(Filter filter) {
+ return null;
+ }
+
+ @Override
+ protected List getIndividualFilterList(String[] filters, ServletContext servletContext) {
+ return null;
+ }
+}
diff --git a/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/NCSAlarmController.java b/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/NCSAlarmController.java
index 965885d..6efc4d8 100644
--- a/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/NCSAlarmController.java
+++ b/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/NCSAlarmController.java
@@ -155,6 +155,7 @@ public class NCSAlarmController {
modelAndView.addObject("alarms", alarms);
modelAndView.addObject("alarmCount", alarmCount);
modelAndView.addObject("parms", parms);
+ modelAndView.addObject("callback", new AlarmNcsFilterCallback(getServletContext()));
return modelAndView;
}
diff --git a/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp b/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp
index b382a97..eaeb996 100644
--- a/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp
+++ b/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp
@@ -36,41 +36,44 @@
<%@page import="java.util.ArrayList" %>
<%@page import="java.util.List" %>
-<%@page import="org.opennms.web.api.Util"%>
-<%@page import="org.opennms.core.utils.InetAddressUtils" %>
+<%@page import="org.opennms.core.utils.InetAddressUtils"%>
<%@page import="org.opennms.core.utils.WebSecurityUtils" %>
-<%@page import="org.opennms.web.servlet.XssRequestWrapper" %>
-<%@page import="org.opennms.web.api.Authentication" %>
+<%@page import="org.opennms.netmgt.model.OnmsAlarm" %>
+<%@page import="org.opennms.web.alarm.AcknowledgeType" %>
+<%@page import="org.opennms.web.alarm.AlarmQueryParms" %>
-<%@page import="org.opennms.web.controller.alarm.AcknowledgeAlarmController" %>
-<%@page import="org.opennms.web.controller.alarm.AlarmSeverityChangeController" %>
+<%@page import="org.opennms.web.alarm.AlarmUtil" %>
+<%@page import="org.opennms.web.alarm.SortStyle" %>
-<%@page import="org.opennms.netmgt.model.OnmsAlarm"%>
+<%@page import="org.opennms.web.alarm.filter.AfterFirstEventTimeFilter"%>
-<%@page import="org.opennms.web.filter.Filter" %>
-<%@page import="org.opennms.web.alarm.AlarmQueryParms" %>
-<%@page import="org.opennms.web.alarm.SortStyle" %>
-<%@page import="org.opennms.web.alarm.AcknowledgeType" %>
-<%@page import="org.opennms.web.alarm.AlarmUtil" %>
+<%@page import="org.opennms.web.alarm.filter.AfterLastEventTimeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.BeforeFirstEventTimeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.BeforeLastEventTimeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.EventParmLikeFilter" %>
<%@page import="org.opennms.web.alarm.filter.ExactUEIFilter" %>
+<%@page import="org.opennms.web.alarm.filter.InterfaceFilter" %>
+<%@page import="org.opennms.web.alarm.filter.NegativeEventParmLikeFilter" %>
<%@page import="org.opennms.web.alarm.filter.NegativeExactUEIFilter" %>
-<%@page import="org.opennms.web.alarm.filter.SeverityFilter" %>
+<%@page import="org.opennms.web.alarm.filter.NegativeInterfaceFilter" %>
+<%@page import="org.opennms.web.alarm.filter.NegativeNodeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.NegativeServiceFilter" %>
<%@page import="org.opennms.web.alarm.filter.NegativeSeverityFilter" %>
<%@page import="org.opennms.web.alarm.filter.NodeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.NegativeNodeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.InterfaceFilter" %>
-<%@page import="org.opennms.web.alarm.filter.NegativeInterfaceFilter" %>
<%@page import="org.opennms.web.alarm.filter.ServiceFilter" %>
-<%@page import="org.opennms.web.alarm.filter.NegativeServiceFilter" %>
-<%@page import="org.opennms.web.alarm.filter.AfterLastEventTimeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.BeforeLastEventTimeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.AfterFirstEventTimeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.BeforeFirstEventTimeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.EventParmLikeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.NegativeEventParmLikeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.SeverityFilter" %>
+<%@page import="org.opennms.web.api.Authentication" %>
+<%@page import="org.opennms.web.api.Util" %>
+<%@page import="org.opennms.web.controller.alarm.AlarmSeverityChangeController" %>
+<%@page import="org.opennms.web.controller.ncs.AlarmNcsFilterCallback" %>
+<%@page import="org.opennms.web.filter.Filter" %>
+<%@page import="org.opennms.web.servlet.XssRequestWrapper" %>
+<%@ page import="org.opennms.web.tags.filters.FilterCallback" %>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@taglib uri="../../taglib.tld" prefix="onms" %>
+
<%--
This page is written to be the display (view) portion of the AlarmQueryServlet
@@ -91,6 +94,7 @@
OnmsAlarm[] alarms = (OnmsAlarm[])req.getAttribute( "alarms" );
int alarmCount = req.getAttribute("alarmCount") == null ? -1 : (Integer)req.getAttribute("alarmCount");
AlarmQueryParms parms = (AlarmQueryParms)req.getAttribute( "parms" );
+ FilterCallback callback = (AlarmNcsFilterCallback) req.getAttribute("callback");
if( alarms == null || parms == null ) {
throw new ServletException( "Missing either the alarms or parms request attribute." );
@@ -112,7 +116,7 @@
-
+
@@ -210,25 +214,31 @@
+
-
-
- - View all alarms
- - Advanced Search
+
+
+
View all alarms>
+ Advanced Search
- - " title="Summary List of Alarms">Short Listing
+ " title="Summary List of Alarms">Short Listing
- - " title="Detailed List of Alarms">Long Listing
+ " title="Detailed List of Alarms">Long Listing
-
- ','', 'fullscreen=no,toolbar=no,status=no,menubar=no,scrollbars=no,resizable=yes,directories=no,location=no,width=525,height=330')" title="Open a window explaining the alarm severities">Severity Legend
+
Severity Legend
<% if( req.isUserInRole( Authentication.ROLE_ADMIN ) || !req.isUserInRole( Authentication.ROLE_READONLY ) ) { %>
<% if ( alarmCount > 0 ) { %>
-
-
<% } %>
<% } %>
-
+
+
+
+
+
+
+
+
+
-
-
<% if( alarmCount > 0 ) { %>
<% String baseUrl = this.makeLink(parms); %>
@@ -260,8 +275,19 @@
<% } %>
-
<% if( parms.filters.size() > 0 || parms.ackType == AcknowledgeType.UNACKNOWLEDGED || parms.ackType == AcknowledgeType.ACKNOWLEDGED ) { %>
+
+
+
+
<% int length = parms.filters.size(); %>
Search constraints:
<% if( parms.ackType == AcknowledgeType.UNACKNOWLEDGED ) { %>
@@ -278,13 +304,13 @@
<% } %>
<% if( req.isUserInRole( Authentication.ROLE_ADMIN ) || !req.isUserInRole( Authentication.ROLE_READONLY ) ) { %>
-