[client/server] add support for advanced configuration for usb/netrules stuff

1 files changed, 9 insertions, 6 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
index 2cc4ff48..c0ce648a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
@@ -73,6 +73,7 @@ public class DbLecture {
 		stmt.setString("netrules", netruleJson);
 		stmt.setBoolean("isexam", lecture.isExam);
 		stmt.setBoolean("hasinternetaccess", lecture.hasInternetAccess);
+		stmt.setBoolean("hasusbaccess", lecture.hasUsbAccess);
 		stmt.setBoolean("caneditdefault", lecture.defaultPermissions.edit);
 		stmt.setBoolean("canadmindefault", lecture.defaultPermissions.admin);
 	}
@@ -100,13 +101,13 @@ public class DbLecture {
 					+ "  isenabled, starttime, endtime, createtime, updatetime,"
 					+ "  isprivate, islocationprivate,"
 					+ "  ownerid, updaterid, runscript, nics, netrules, isexam,"
-					+ "  hasinternetaccess, caneditdefault, canadmindefault)"
+					+ "  hasinternetaccess, hasusbaccess, caneditdefault, canadmindefault)"
 					+ "         VALUES             "
 					+ " (:lectureid, :displayname, :description, :imageversionid, :autoupdate,"
 					+ "  :isenabled, :starttime, :endtime, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(),"
 					+ "  :isprivate, :islocationprivate,"
 					+ "  :ownerid, :updaterid, :runscript, :nics, :netrules, :isexam,"
-					+ "  :hasinternetaccess, :caneditdefault, :canadmindefault)");
+					+ "  :hasinternetaccess, :hasusbaccess, :caneditdefault, :canadmindefault)");
 			String lectureId = UUID.randomUUID().toString();
 			setWriteFields(stmt, lectureId, lecture, user);
 			stmt.setString("ownerid", user.userId);
@@ -128,7 +129,7 @@ public class DbLecture {
 				+ " endtime = :endtime, updatetime = UNIX_TIMESTAMP(),"
 				+ " isprivate = :isprivate, islocationprivate = :islocationprivate,"
 				+ " updaterid = :updaterid, runscript = :runscript, nics = :nics,"
-				+ " netrules = :netrules, isexam = :isexam, hasinternetaccess = :hasinternetaccess,"
+				+ " netrules = :netrules, isexam = :isexam, hasinternetaccess = :hasinternetaccess, hasusbaccess = :hasusbaccess,"
 				+ " caneditdefault = :caneditdefault, canadmindefault = :canadmindefault"
 				+ " WHERE lectureid = :lectureid");
 		setWriteFields(stmt, lectureId, lecture, user);
@@ -177,6 +178,7 @@ public class DbLecture {
 		lecture.setUpdaterId(rs.getString("updaterid"));
 		lecture.setIsExam(rs.getBoolean("isexam"));
 		lecture.setHasInternetAccess(rs.getBoolean("hasinternetaccess"));
+		lecture.setHasUsbAccess(rs.getBoolean("hasusbaccess"));
 		lecture.setDefaultPermissions(DbLecturePermissions.fromResultSetDefault(rs));
 		lecture.setUserPermissions(DbLecturePermissions.fromResultSetUser(rs));
 		lecture.setIsImageVersionUsable(rs.getBoolean("imgvalid"));
@@ -189,7 +191,7 @@ public class DbLecture {
 	private static final String summaryBaseSql = "SELECT"
 			+ " l.lectureid, l.displayname AS lecturename, l.imageversionid, i.imagebaseid,"
 			+ " l.isenabled, l.starttime, l.endtime, l.lastused, l.usecount, l.ownerid, l.updaterid,"
-			+ " l.isexam, l.hasinternetaccess, l.caneditdefault, l.canadmindefault,"
+			+ " l.isexam, l.hasinternetaccess, l.hasusbaccess, l.caneditdefault, l.canadmindefault,"
 			+ " i.isvalid AS imgvalid, perm.canedit, perm.canadmin"
 			+ "                      FROM lecture l                 "
 			+ " LEFT JOIN imageversion i USING (imageversionid)"
@@ -264,8 +266,8 @@ public class DbLecture {
 					+ " l.lectureid, l.displayname AS lecturename, l.description, l.imageversionid, i.imagebaseid,"
 					+ " l.autoupdate, l.isenabled, l.starttime, l.endtime, l.lastused, l.usecount, l.createtime,"
 					+ " l.updatetime, l.ownerid, l.updaterid, l.runscript, l.nics, l.netrules, l.isexam,"
-					+ " l.isprivate, l.islocationprivate,"
-					+ " l.hasinternetaccess, l.caneditdefault, l.canadmindefault, p.canedit, p.canadmin"
+					+ " l.isprivate, l.islocationprivate, l.hasinternetaccess, l.hasusbaccess,"
+					+ " l.caneditdefault, l.canadmindefault, p.canedit, p.canadmin"
 					+ "                   FROM lecture l            "
 					+ " LEFT JOIN imageversion i USING (imageversionid)"
 					+ " LEFT JOIN lecturepermission p ON (l.lectureid = p.lectureid AND p.userid = :userid)"
@@ -308,6 +310,7 @@ public class DbLecture {
 			}
 			lecture.setIsExam(rs.getBoolean("isexam"));
 			lecture.setHasInternetAccess(rs.getBoolean("hasinternetaccess"));
+			lecture.setHasUsbAccess(rs.getBoolean("hasusbaccess"));
 			lecture.setAllowedUsers(getAllowedUsers(connection, lectureId));
 			lecture.setDefaultPermissions(DbLecturePermissions.fromResultSetDefault(rs));
 			lecture.setUserPermissions(DbLecturePermissions.fromResultSetUser(rs));