Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
g

1 files changed, 7 insertions, 10 deletions

diff --git a/dozentenmodul/src/main/java/models/RightsManagement.java b/dozentenmodul/src/main/java/models/RightsManagement.java
index 38661870..d2de8e8c 100644
--- a/dozentenmodul/src/main/java/models/RightsManagement.java
+++ b/dozentenmodul/src/main/java/models/RightsManagement.java
@@ -10,22 +10,19 @@ public class RightsManagement {
 		//
 	}
 	
+	//list which holds all selected users and permissions for this session and type (either for image or lecture, depending on 
+	private List<person> permittedUserList = new ArrayList<person>(); 
 	
-	
-	//list which holds all users and (non-)selected values of the table rightstable in permissionCreateImage 
-	private List<person> pmImageCreateList = new ArrayList<person>(); 
 
-	
-	
-	
+		
 	public static RightsManagement rightsManagement = new RightsManagement();
 
-	public List<person> getPmImageCreateList() {
-		return pmImageCreateList;
+	public List<person> getPermittedUserList() {
+		return permittedUserList;
 	}
 
-	public void setPmImageCreateList(List<person> list) {
-		this.pmImageCreateList = list;
+	public void setPermittedUserList(List<person> list) {
+		this.permittedUserList = list;
 	}
 
 }