Merge branch 'master-sdtabilit' into SLTS-39-Add-icon-PointProperties…

…-on-the-form-the-data-source
SCADA-LTS · Oct 28, 2016 · f78acb6 · f78acb6
2 parents 43ca0d2 + 2c630ce
commit f78acb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,7 @@ branches:
   only:
   - "/^PROC-.*$/"
   - "/^develop-sdtabilit.*$/"
+  - "/^master-sdtabilit.*$/"
 notifications:
   email: false
 env:

diff --git a/src/org/scada_lts/dao/UnsilencedAlarmDAO.java b/src/org/scada_lts/dao/UnsilencedAlarmDAO.java
@@ -47,7 +47,7 @@ public class UnsilencedAlarmDAO {
 			    + "userEvents u "
 			    + "join events e on u.eventId=e.id "
 			+ "where "
-				+ "u.silenced='false' "
+				+ "u.silenced='N' "
 			+ "group by "
 				+ "userId";
 	// @formatter:on
@@ -62,7 +62,7 @@ protected List<UnsilencedAlarmLevelCache> getAll() {
 				public UnsilencedAlarmLevelCache mapRow(ResultSet rs, int rownumber) throws SQLException {
 					UnsilencedAlarmLevelCache unsilencedAlarmLevel = new UnsilencedAlarmLevelCache();
 					unsilencedAlarmLevel.setAlarmLevel(rs.getInt(COLUMN_NAME_MAX));
-					unsilencedAlarmLevel.setAlarmLevel(rs.getInt(COLUMN_NAME_USERID));
+					unsilencedAlarmLevel.setUserId(rs.getInt(COLUMN_NAME_USERID));
 					return unsilencedAlarmLevel;
 				}
 			});