[Hyperic-hq-discuss] hq r12339 - in trunk/src/org/hyperic/hq: escalation/server/session ui/action/resource/common/monitor/alerts

[<pn...@hy...>]

Author: pnguyen
Date: 2009-01-23 15:25:10 -0800 (Fri, 23 Jan 2009)
New Revision: 12339
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=12339

Modified:
   trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java
   trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/PortalAction.java
Log:
HQ-666: add support for comments during alert acknowledgement

Modified: trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java	2009-01-23 23:19:28 UTC (rev 12338)
+++ trunk/src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java	2009-01-23 23:25:10 UTC (rev 12339)
@@ -601,23 +601,31 @@
     {
         Escalatable esc = type.findEscalatable(alertId);
         EscalationState state = _stateDAO.find(esc);
+        if (moreInfo == null || moreInfo.trim().length() == 0) {
+            moreInfo = "";
+        }
         if (pause > 0) {
         	long nextTime;
         	if (pause == Long.MAX_VALUE) {
         		nextTime = pause;
-                moreInfo = " and paused escalation until fixed";
+                moreInfo = " and paused escalation until fixed. " + moreInfo;
         	} else {
         		nextTime = System.currentTimeMillis() + pause;
                 FormattedNumber fmtd =
                     UnitsFormat.format(new UnitNumber(pause,
                                                       UnitsConstants.UNIT_DURATION,
                                                       UnitsConstants.SCALE_MILLI));
-                moreInfo = " and paused escalation for " + fmtd;
+                moreInfo = " and paused escalation for " + fmtd 
+                                + ". " + moreInfo;
         	}
             if (nextTime > state.getNextActionTime()) {
                 state.setNextActionTime(nextTime);
                 EscalationRuntime.getInstance().scheduleEscalation(state);
             }
+        } else {
+            if (moreInfo.length() > 0) {
+                moreInfo = ". " + moreInfo;
+            }
         }
         fixOrNotify(subject, esc, state, type, false, moreInfo);
     }
@@ -725,8 +733,9 @@
             if (state != null)
                 endEscalation(state);
         } else {
-            if (moreInfo == null)
+            if (moreInfo == null || moreInfo.trim().length() == 0) {
                 moreInfo = "";
+            }
             
             if (state.getAcknowledgedBy() != null) {
                 _log.warn(subject.getFullName() + " attempted to acknowledge "+

Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/PortalAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/PortalAction.java	2009-01-23 23:19:28 UTC (rev 12338)
+++ trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/PortalAction.java	2009-01-23 23:25:10 UTC (rev 12339)
@@ -205,6 +205,7 @@
         EventsBoss eb = ContextUtils.getEventsBoss(ctx);
 
         Integer alertId = new Integer( request.getParameter("a") );
+        String ackNote = RequestUtils.getStringParameter(request, "ackNote", "");
         
         long pause = 0;
         try {
@@ -223,7 +224,7 @@
             
             if (aeid.isGroup()) {
                 eb.acknowledgeAlert(sessionID, GalertEscalationAlertType.GALERT,
-                                    alertId, pause, null);
+                                    alertId, pause, ackNote);
             }
         } catch (ParameterNotFoundException e) {
             // not a problem, this can be null
@@ -233,7 +234,7 @@
             // Classic alerts
             eb.acknowledgeAlert(sessionID, 
                                 ClassicEscalationAlertType.CLASSIC,
-                                alertId, pause, null);
+                                alertId, pause, ackNote);
         }
         
         RequestUtils.setConfirmation(request,