Merge pull request #2681 from SCADA-LTS/fix/#2673_Fixed_unavailabilit…

…y_of_acknowledge_for_active_event #2673 Fixed unavailability of acknowledge for active event - hidden a…
SCADA-LTS · Aug 31, 2023 · 496e346 · 496e346
2 parents e35b3d6 + 3d10bb5
commit 496e346
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/WebContent/WEB-INF/tags/alarmAck.tag b/WebContent/WEB-INF/tags/alarmAck.tag
@@ -22,7 +22,7 @@
   <c:choose>
     <c:when test="${event.acknowledged}"><tag:img png="tick_off" title="events.acknowledged" style="display:inline;"/></c:when>
     <c:otherwise>
-      <tag:img png="tick" id="ackImg${event.id}" onclick="ackEvent(${event.id})" title="events.acknowledge" style="display:inline;"/>
+      <c:if test="${not event.active}"><tag:img png="tick" id="ackImg${event.id}" onclick="ackEvent(${event.id})" title="events.acknowledge" style="display:inline;"/></c:if>
       <c:choose>
         <c:when test="${event.silenced}">
           <tag:img png="sound_mute" id="silenceImg${event.id}" onclick="toggleSilence(${event.id})" title="events.unsilence" style="display:inline;"/>

diff --git a/src/com/serotonin/mango/web/dwr/MiscDwr.java b/src/com/serotonin/mango/web/dwr/MiscDwr.java
@@ -121,9 +121,12 @@ public int acknowledgeEvent(int eventId) {
 		User user = Common.getUser();
 		MangoEvent eventService = new EventService();
 		if (user != null) {
-			eventService.ackEvent(eventId, System.currentTimeMillis(),
-					user.getId(), 0);
-			resetLastAlarmLevelChange();
+			EventInstance evt = eventService.getEvent(eventId);
+			if(evt != null && !evt.isActive()) {
+				eventService.ackEvent(evt.getId(), System.currentTimeMillis(),
+						user.getId(), 0);
+				resetLastAlarmLevelChange();
+			}
 		}
 		return eventId;
 	}
@@ -133,8 +136,10 @@ public void acknowledgeAllPendingEvents() {
 		if (user != null) {
 			MangoEvent eventService = new EventService();
 			long now = System.currentTimeMillis();
-			for (EventInstance evt : eventService.getPendingEvents(user.getId()))
-				eventService.ackEvent(evt.getId(), now, user.getId(), 0);
+			for (EventInstance evt : eventService.getPendingEvents(user.getId())) {
+				if(!evt.isActive())
+					eventService.ackEvent(evt.getId(), now, user.getId(), 0);
+			}
 			resetLastAlarmLevelChange();
 		}
 	}