diff options
| author | Jonathan Bauer | 2018-12-03 14:25:29 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2018-12-03 14:25:29 +0100 |
| commit | 84ee13dbae07b5f29b18a6f6ff2627864da967cd (patch) | |
| tree | fb2cefd171afde57f395a59567b34b29647ba8b8 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | |
| parent | [server] Updater: Fix netshare table layout (diff) | |
| download | tutor-module-84ee13dbae07b5f29b18a6f6ff2627864da967cd.tar.gz tutor-module-84ee13dbae07b5f29b18a6f6ff2627864da967cd.tar.xz tutor-module-84ee13dbae07b5f29b18a6f6ff2627864da967cd.zip | |
[server] support predefined network shares
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 | 12 |
1 files changed, 7 insertions, 5 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 347109dc..3d5330a7 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 @@ -16,6 +16,7 @@ import org.openslx.bwlp.sat.database.mappers.DbImage.DeleteState; import org.openslx.bwlp.sat.database.mappers.DbImagePermissions; import org.openslx.bwlp.sat.database.mappers.DbLecture; import org.openslx.bwlp.sat.database.mappers.DbLectureFilter; +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; @@ -52,7 +53,6 @@ import org.openslx.bwlp.thrift.iface.LectureSummary; import org.openslx.bwlp.thrift.iface.LectureWrite; import org.openslx.bwlp.thrift.iface.Location; import org.openslx.bwlp.thrift.iface.NetShare; -import org.openslx.bwlp.thrift.iface.NetShareAuth; import org.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.bwlp.thrift.iface.Organization; import org.openslx.bwlp.thrift.iface.PredefinedData; @@ -797,10 +797,12 @@ public class ServerHandler implements SatelliteServer.Iface { throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, "Database failure when querying predefined LDAP filters."); } - // Dummy 2 - NetShare ns = new NetShare(NetShareAuth.OTHER_USER, "\\\\server.example.org\\data"); - ns.setShareId(1); - data.netShares.add(ns); + try { + data.netShares = DbLectureNetshare.getPredefinedNetshares(); + } catch (SQLException e) { + throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, + "Database failure when querying predefined network shares."); + } return data; } |