[Hyperic-hq-discuss] hq r12783 - in branches/HQ_4_1/web: WEB-INF/classes resource/common/monitor/alerts/config

[<dcr...@hy...>]

Author: dcrutchf
Date: 2009-03-16 15:13:13 -0700 (Mon, 16 Mar 2009)
New Revision: 12783
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=12783

Modified:
   branches/HQ_4_1/web/WEB-INF/classes/ApplicationResources.properties
   branches/HQ_4_1/web/resource/common/monitor/alerts/config/DefinitionProperties.jsp
Log:
Added warning message for deactivation of disabled alert definitions

Modified: branches/HQ_4_1/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- branches/HQ_4_1/web/WEB-INF/classes/ApplicationResources.properties	2009-03-16 21:51:33 UTC (rev 12782)
+++ branches/HQ_4_1/web/WEB-INF/classes/ApplicationResources.properties	2009-03-16 22:13:13 UTC (rev 12783)
@@ -2075,6 +2075,7 @@
 alert.config.props.PB.ActiveYes=Yes
 alert.config.props.PB.ActiveNo=No
 alert.config.props.PB.ActiveButDisabled=This alert definition has generated an alert and is currently disabled until the issue is fixed. 
+alert.config.props.PB.ActiveButDisabledWarning=This alert definition has generated an alert that has not been fixed. Deactivating this definition will not change the state of the unfixed alert. 
 alert.config.props.PB.ActiveInactive=INACTIVE
 alert.config.props.PB.ActiveActive=ACTIVE
 alert.config.props.PB.AlertDefinitionActive=Alert Definition Active:

Modified: branches/HQ_4_1/web/resource/common/monitor/alerts/config/DefinitionProperties.jsp
===================================================================
--- branches/HQ_4_1/web/resource/common/monitor/alerts/config/DefinitionProperties.jsp	2009-03-16 21:51:33 UTC (rev 12782)
+++ branches/HQ_4_1/web/resource/common/monitor/alerts/config/DefinitionProperties.jsp	2009-03-16 22:13:13 UTC (rev 12783)
@@ -113,7 +113,15 @@
     <td width="30%" class="BlockContent">
       <html:radio property="active" value="true"/>
       <fmt:message key="alert.config.props.PB.ActiveYes"/><br>
-      <html:radio property="active" value="false"/>
+      <c:choose>
+      	<c:when test="${alertDef.enabled}">
+	      <html:radio property="active" value="false"/>
+      	</c:when>
+      	<c:otherwise>
+      	  <fmt:message var="activeButDisabledWarningMsg" key="alert.config.props.PB.ActiveButDisabledWarning" />
+	      <html:radio property="active" value="false" onchange="if (this.checked) { alert('${activeButDisabledWarningMsg}'); }" />
+      	</c:otherwise>
+      </c:choose>
       <fmt:message key="alert.config.props.PB.ActiveNo"/>
     </td>
     </logic:messagesNotPresent>