summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNino Breuer2014-11-03 00:52:09 +0100
committerNino Breuer2014-11-03 00:52:09 +0100
commite7ff1563f8a9d4c61b6bcfd962054e6e1abe67f3 (patch)
treea9b7825f7402571e42991cba577b049e9586a252
parentMerge branch 'master' of git.openslx.org:openslx-ng/tutor-module (diff)
downloadtutor-module-e7ff1563f8a9d4c61b6bcfd962054e6e1abe67f3.tar.gz
tutor-module-e7ff1563f8a9d4c61b6bcfd962054e6e1abe67f3.tar.xz
tutor-module-e7ff1563f8a9d4c61b6bcfd962054e6e1abe67f3.zip
v
-rw-r--r--dozentenmodulserver/src/main/java/sql/SQL.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index 93f76a10..a7aefbe7 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -467,7 +467,7 @@ public class SQL {
// ResultSet
ResultSet res = stm
- .executeQuery("SELECT DISTINCT vl.GUID_imageID, vl.imageVersion, vl.image_name, vl.cond_hasLicenseRestriction, os.name, os.architecture, '' as lecture, vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user, vl.image_isTemplate FROM bwLehrpool.pm_VLData_image pmi, bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u WHERE pmi.userID='"
+ .executeQuery("SELECT DISTINCT vl.GUID_imageID, vl.imageVersion, vl.image_name,vl_image_description, vl.cond_hasLicenseRestriction, os.name, os.architecture, '' as lecture, vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user, vl.image_isTemplate FROM bwLehrpool.pm_VLData_image pmi, bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u WHERE pmi.userID='"
+ userID
+ "' AND u.userID = pmi.userID AND pmi.image_admin = 1 AND pmi.GUID_imageID = vl.GUID_imageID AND vl.content_operatingSystem=os.operatingSystemID;");