From 9f07b91ba397b3dedabe67ae7406c2a888737450 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 15:13:16 +0200 Subject: fff --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11888 -> 11888 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 5 +++++ Dozentenmodulserver/bin/sql/SQL.class | Bin 15301 -> 15324 bytes Dozentenmodulserver/src/sql/SQL.java | 4 ++-- 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 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class 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 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class 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(); -- cgit v1.2.3-55-g7522