diff options
| author | Nino Breuer | 2014-11-18 15:31:20 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-11-18 15:31:20 +0100 |
| commit | 7658a51f286bad750eea3629b0fac4780c429afe (patch) | |
| tree | 2dad2c07a8696bc79b20e153a6cf5ab3d6a3f99b /dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| download | tutor-module-7658a51f286bad750eea3629b0fac4780c429afe.tar.gz tutor-module-7658a51f286bad750eea3629b0fac4780c429afe.tar.xz tutor-module-7658a51f286bad750eea3629b0fac4780c429afe.zip | |
• fixed bug, where there could only be one image and one lecture with the same name
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 66819a80..e656a711 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -101,6 +101,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // file Component c = null; private boolean isAborted = false; //down- or upload was manually aborted + private String uuid; private static final String HELP_MESSAGE = "<html><div align = \"center\">" + "Laden Sie hier Ihre .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.<br />" + @@ -561,6 +562,14 @@ public class FTPCreateUploader_GUI extends JFrame implements }); menuBar.add(mnNewMenu_Info); + try + { + uuid = client.createRandomUUID(); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + c = this; } @@ -666,7 +675,6 @@ public class FTPCreateUploader_GUI extends JFrame implements public boolean writeData() { try { - client.writeVLdata(Image.image.getImagename(), Image.image.getDesc(), @@ -685,11 +693,12 @@ public class FTPCreateUploader_GUI extends JFrame implements Image.image.isVorlage(), Image.image.getFilesize(), Image.image.getShareMode(), - Image.image.getOS()); + Image.image.getOS(), + uuid); client.startFileCopy(Image.image.getNewName()); - client.writeImageRights(Image.image.getImagename(), + client.writeImageRights(uuid, person.verantwortlicher.getUsername(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), @@ -698,10 +707,11 @@ public class FTPCreateUploader_GUI extends JFrame implements person.verantwortlicher.getRole() ); - for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){ - System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); + for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++) + { + //System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); client.writeAdditionalImageRights( - Image.image.getImagename(), + uuid, RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(), |