summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorunknown2014-04-15 15:13:16 +0200
committerunknown2014-04-15 15:13:16 +0200
commit9f07b91ba397b3dedabe67ae7406c2a888737450 (patch)
treec83322ee810838d25d7457286a65926e49d34ea5
parentbhh (diff)
downloadtutor-module-9f07b91ba397b3dedabe67ae7406c2a888737450.tar.gz
tutor-module-9f07b91ba397b3dedabe67ae7406c2a888737450.tar.xz
tutor-module-9f07b91ba397b3dedabe67ae7406c2a888737450.zip
fff
-rw-r--r--Dozentenmodul/bin/gui/image/DeleteImage_GUI.classbin11888 -> 11888 bytes
-rw-r--r--Dozentenmodul/src/gui/image/DeleteImage_GUI.java5
-rw-r--r--Dozentenmodulserver/bin/sql/SQL.classbin15301 -> 15324 bytes
-rw-r--r--Dozentenmodulserver/src/sql/SQL.java4
4 files changed, 7 insertions, 2 deletions
diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index 8d402e29..8f2488bd 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
Binary files differ
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 1b84d984..146ee5c6 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -464,6 +464,11 @@ public class DeleteImage_GUI extends JFrame {
// tmpFile.getName()));
// FileUtils.ForceDelete (.. );
+ } else {
+
+ JOptionPane.showMessageDialog(null,
+ "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
+ "Verlinkung vorhanden", JOptionPane.INFORMATION_MESSAGE);
}
} catch (TException e) {
// TODO Auto-generated catch block
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index f61d58a7..2f3b1a12 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
Binary files differ
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 895c225b..485d51fd 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -511,8 +511,8 @@ public class SQL {
ResultSet rs = stm
.executeQuery("SELECT lectureID FROM "
- + "bwLehrpool.m_VLDatalecture where imageID = '"
- + id + "' " + "AND imageVersion = '"
+ + "bwLehrpool.m_VLData_lecture WHERE imageID = '"
+ + id + "' AND imageVersion = '"
+ version + "';");
return rs.first();