Merge pull request #2635 from SCADA-LTS/fix/#2555_Fixed_error_save_ch…

…eckbox_Disabled_in_Maintenance_event #2555 Fixed error save checkbox Disabled in Maintenance events -
SCADA-LTS · Jul 22, 2023 · 1b58360 · 1b58360
2 parents 917e8dd + d5fbe6f
commit 1b58360
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/org/scada_lts/dao/MaintenanceEventDAO.java b/src/org/scada_lts/dao/MaintenanceEventDAO.java
@@ -188,7 +188,7 @@ public MaintenanceEventVO mapRow(ResultSet rs, int rowNum) throws SQLException {
 			maintenanceEvent.setAlias(rs.getString(COLUMN_NAME_ALIAS));
 			maintenanceEvent.setAlarmLevel(rs.getInt(COLUMN_NAME_ALARM_LEVEL));
 			maintenanceEvent.setScheduleType(rs.getInt(COLUMN_NAME_SCHEDULE_TYPE));
-			maintenanceEvent.setDisabled(DAO.charToBool(COLUMN_NAME_DISABLED));
+			maintenanceEvent.setDisabled(DAO.charToBool(rs.getString(COLUMN_NAME_DISABLED)));
 			maintenanceEvent.setActiveYear(rs.getInt(COLUMN_NAME_ACTIVE_YEAR));
 			maintenanceEvent.setActiveMonth(rs.getInt(COLUMN_NAME_ACTIVE_MONTH));
 			maintenanceEvent.setActiveDay(rs.getInt(COLUMN_NAME_ACTIVE_DAY));

diff --git a/src/org/scada_lts/dao/error/CustomSQLEroorCodesTranslator.java b/src/org/scada_lts/dao/error/CustomSQLEroorCodesTranslator.java
@@ -5,6 +5,7 @@
 import org.springframework.context.MessageSource;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 
+@Deprecated(since = "2.7.5.4")
 public class CustomSQLEroorCodesTranslator extends SQLErrorCodeSQLExceptionTranslator {
 
 	@Resource