diff options
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java index 8e1ed59e..f97766ed 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java @@ -20,6 +20,7 @@ import org.openslx.bwlp.sat.database.mappers.DbLectureNetshare; import org.openslx.bwlp.sat.database.mappers.DbLecturePermissions; import org.openslx.bwlp.sat.database.mappers.DbLocation; import org.openslx.bwlp.sat.database.mappers.DbLog; +import org.openslx.bwlp.sat.database.mappers.DbRunScript; import org.openslx.bwlp.sat.database.mappers.DbUser; import org.openslx.bwlp.sat.database.models.ImageVersionMeta; import org.openslx.bwlp.sat.database.models.LocalImageVersion; @@ -56,6 +57,7 @@ import org.openslx.bwlp.thrift.iface.NetShare; import org.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.bwlp.thrift.iface.Organization; import org.openslx.bwlp.thrift.iface.PredefinedData; +import org.openslx.bwlp.thrift.iface.PresetRunScript; import org.openslx.bwlp.thrift.iface.SatelliteConfig; import org.openslx.bwlp.thrift.iface.SatelliteServer; import org.openslx.bwlp.thrift.iface.SatelliteStatus; @@ -790,7 +792,7 @@ public class ServerHandler implements SatelliteServer.Iface { public PredefinedData getPredefinedData(String userToken) throws TAuthorizationException, TInvocationException, TException { SessionManager.ensureAuthenticated(userToken); // Only logged in users - PredefinedData data = new PredefinedData(new ArrayList<NetShare>(), new ArrayList<LdapFilter>()); + PredefinedData data = new PredefinedData(); try { data.ldapFilter = DbLectureFilter.getPredefinedLdapFilters(); } catch (SQLException e) { @@ -803,6 +805,12 @@ public class ServerHandler implements SatelliteServer.Iface { throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, "Database failure when querying predefined network shares."); } + try { + data.runScripts = DbRunScript.getPredefinedRunScripts(); + } catch (SQLException e) { + throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, + "Database failure when querying predefined run scripts."); + } return data; } |