Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java

möp. großes geschrei, fehler bitte an mich.
	dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
	dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
	dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
	dozentenmodulserver/src/main/java/server/ServerHandler.java
	dozentenmodulserver/src/main/java/server/generated/Server.java
	dozentenmodulserver/thrift/server.thrift

1 files changed, 9 insertions, 2 deletions

diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index 9144e4b1..b7cb4ada 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -1396,11 +1396,18 @@ public class SQL {
 			//delete the lecture record

 			String sql = "DELETE FROM bwLehrpool.m_VLData_lecture WHERE lectureID = ?;";

 			PreparedStatement prest = con.prepareStatement(sql);

-			prest.setString(1, id);

+			prest.setString(1, id); 

 			

 			prest.executeUpdate();

 

-			//delete all permission records for this lecture		

+			

+			//delete all permission records for this lecture

+			sql = "DELETE FROM bwLehrpool.pm_VLData_lecture WHERE lectureID = ?;";

+			prest = con.prepareStatement(sql);

+			prest.setString(1, id); 

+			

+			prest.executeUpdate();

+			

 			con.commit();

 			con.close();

 			return true;