-

3 files changed, 38 insertions, 7 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 9f2d59c4..68a05bc9 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -41,7 +41,9 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.filechooser.FileNameExtensionFilter;
 
 import models.Image;
+import models.ImageRights;
 import models.Links;
+import models.RightsManagement;
 import models.SessionData;
 import models.person;
 
@@ -637,7 +639,9 @@ public class FTPEditUploader_GUI extends JFrame implements
 		try {
 			LOGGER.debug("NewName: " + Image.image.getNewName());
 			LOGGER.debug("OldName: " + Image.image.getImagename());
-			if (Image.image.getNewName() != null) {
+			
+			if (Image.image.getNewName() != null) 
+			{
 				client.updateImageData(Image.image.getImagename(),
 						Image.image.getImagename(), Image.image.getDesc(),
 						Image.image.getImagepath(), Image.image.isLicensed(),
@@ -650,7 +654,9 @@ public class FTPEditUploader_GUI extends JFrame implements
 					client.startFileCopy(Image.image.getNewName());
 				}
 
-			} else {
+			} 
+			else 
+			{
 
 				client.updateImageData(Image.image.getImagename(),
 						Image.image.getImagename(), Image.image.getDesc(),
@@ -665,6 +671,28 @@ public class FTPEditUploader_GUI extends JFrame implements
 					client.startFileCopy(Image.image.getNewName());
 				}
 			}
+			
+			//set additional user rights - quick and dirty TODO refactor
+			
+			//remove all additional user permissions on first stage
+			
+			client.deleteAllAdditionalImagePermissions(Image.image.getImageId(),person.verantwortlicher.getUserID());
+			
+			//then, add user permissions as they have been set new
+			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(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()
+						);
+			
+			}//end for
+
+			
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index ffe0819a..04911c20 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -194,7 +194,9 @@ public class PermissionEditImage_GUI extends JFrame {
 				Iterator<server.generated.Person> i = map.iterator();
 
 				int x = 0;
-				while (i.hasNext()) {
+				
+				while (i.hasNext()) 
+				{
 					// erzeuge Objekte fuer die Tabelle
 					Object[] obj = {
 							map.get(x).getNachname() + ", "
@@ -208,11 +210,11 @@ public class PermissionEditImage_GUI extends JFrame {
 					System.out.println(map.get(x).isImage_read()+"gfhfxg");
 					// Fuege diese Objekte der Tabelle hinzu
 					model.addRow(obj);
+					
 					i.next();
 					x++;
 
 				}
-				//RightsManagement.rightsManagement.setPermittedUserList(obj);
 
 			} catch (TException e1) {
 				// TODO Auto-generated catch block
@@ -587,13 +589,16 @@ public class PermissionEditImage_GUI extends JFrame {
 		}
 
 
+		/*
 		System.out.println("Setting list information.\tTable size: "
 				+ table.getRowCount() + "\t List length (=selected users): "
 				+ list.size());
 		for (int y = 0; y < list.size(); y++) {
 			System.out.println("" + list.get(y).getName());
 		}
+		*/
 
+		//permissions could have changed, compare vals at the end and update in db (quick and dirty due to time limitations)
 		RightsManagement.rightsManagement.setPermittedUserList(list);
 	}// end saveTableToList()
 
diff --git a/dozentenmodul/src/main/java/models/RightsManagement.java b/dozentenmodul/src/main/java/models/RightsManagement.java
index d2de8e8c..d93ade10 100644
--- a/dozentenmodul/src/main/java/models/RightsManagement.java
+++ b/dozentenmodul/src/main/java/models/RightsManagement.java
@@ -10,11 +10,9 @@ public class RightsManagement {
 		//
 	}
 	
-	//list which holds all selected users and permissions for this session and type (either for image or lecture, depending on 
+	//list which holds all selected users and permissions for this session and type (either for image or lecture, depending on mode)
 	private List<person> permittedUserList = new ArrayList<person>(); 
-	
 
-		
 	public static RightsManagement rightsManagement = new RightsManagement();
 
 	public List<person> getPermittedUserList() {