OO-4872: remove user name column in waiting list of topic assignement

src/main/java/org/olat/admin/securitygroup/gui/GroupController.java

@@ -688,7 +688,7 @@ public class GroupController extends BasicController {
 		}
 		
 		List<UserPropertyHandler> userPropertyHandlers = userManager.getUserPropertyHandlersFor(usageIdentifyer, isAdministrativeUser);
-		identitiesTableModel = new IdentitiesOfGroupTableDataModel(views, getLocale(), userPropertyHandlers, isAdministrativeUser);
+		identitiesTableModel = new IdentitiesOfGroupTableDataModel(views, getLocale(), userPropertyHandlers);
 		tableCtr.setTableDataModel(identitiesTableModel);
 	}
 }

src/main/java/org/olat/admin/securitygroup/gui/IdentitiesOfGroupTableDataModel.java

@@ -44,43 +44,44 @@ import org.olat.user.propertyhandlers.UserPropertyHandler;
 
 public class IdentitiesOfGroupTableDataModel extends DefaultTableDataModel<GroupMemberView> {
 	private List<UserPropertyHandler> userPropertyHandlers;
-	private boolean isAdministrativeUser;
-
    
 	/**
 	 * @param combo a List of Object[] with the array[0] = Identity, array[1] = addedToGroupTimestamp
 	 */
-	public IdentitiesOfGroupTableDataModel(List<GroupMemberView> combo, Locale locale, List<UserPropertyHandler> userPropertyHandlers, boolean isAdministrativeUser) {
+	public IdentitiesOfGroupTableDataModel(List<GroupMemberView> combo, Locale locale, List<UserPropertyHandler> userPropertyHandlers) {
 		super(combo);
 		setLocale(locale);		
 		this.userPropertyHandlers = userPropertyHandlers;
-		this.isAdministrativeUser = isAdministrativeUser;
 	}
 
 	@Override
 	public final Object getValueAt(int row, int col) {
 		GroupMemberView co = getObject(row);
-		switch(col) {
-			case 1: return co.getOnlineStatus();
-			case 2: return co.getAddedAt();
-			default: {
-				User user = co.getIdentity().getUser();
-				UserPropertyHandler userPropertyHandler = userPropertyHandlers.get(col - 3);
-				String value = userPropertyHandler.getUserProperty(user, getLocale());
-				return (value == null ? "n/a" : value);
-			}
+		if(col == 1) {
+			return co.getOnlineStatus();
+		}
+		if(col == 2) {
+			return co.getAddedAt();
+		}
+		int index = col - 3;
+		if(index >= 0 && index < userPropertyHandlers.size()) {
+			User user = co.getIdentity().getUser();
+			UserPropertyHandler userPropertyHandler = userPropertyHandlers.get(col - 3);
+			String value = userPropertyHandler.getUserProperty(user, getLocale());
+			return (value == null ? "n/a" : value);
 		}
+		return "ERROR";
 	}
 
 	@Override
 	public int getColumnCount() {
-		// + loginname + adddate or just + loginname
-		return userPropertyHandlers.size() + (isAdministrativeUser ? 2 : 1);
+		// online status + add date
+		return userPropertyHandlers.size() +  2;
 	}
 	
 	@Override
 	public IdentitiesOfGroupTableDataModel createCopyWithEmptyList() {
-		return new IdentitiesOfGroupTableDataModel(new ArrayList<GroupMemberView>(), getLocale(), userPropertyHandlers, isAdministrativeUser);
+		return new IdentitiesOfGroupTableDataModel(new ArrayList<GroupMemberView>(), getLocale(), userPropertyHandlers);
 	}
 	
 	/**

src/main/java/org/olat/admin/securitygroup/gui/WaitingGroupController.java

@@ -144,12 +144,6 @@ public class WaitingGroupController extends GroupController {
 	protected void initGroupTable(TableController tableCtr, UserRequest ureq, boolean enableTablePreferences, boolean enableUserSelection) {
 		List<UserPropertyHandler> userPropertyHandlers = userManager.getUserPropertyHandlersFor(usageIdentifyer, isAdministrativeUser);
 		// first the login name
-		if (isAdministrativeUser) {
-			// first the login name, but only if administrative user
-			DefaultColumnDescriptor cd0 = new DefaultColumnDescriptor("table.user.login", 0, COMMAND_VCARD, ureq.getLocale());
-			cd0.setIsPopUpWindowAction(true, "height=700, width=900, location=no, menubar=no, resizable=yes, status=no, scrollbars=yes, toolbar=no");
-			tableCtr.addColumnDescriptor(cd0);
-		}
 		if(chatEnabled) {
 			tableCtr.addColumnDescriptor(new CustomRenderColumnDescriptor("table.header.online", 1, COMMAND_IM, getLocale(),
 					ColumnDescriptor.ALIGNMENT_LEFT, new OnlineIconRenderer()));

src/main/java/org/olat/course/nodes/projectbroker/GroupController.java

@@ -698,7 +698,7 @@ public class GroupController extends BasicController {
 		}
 		
 		List<UserPropertyHandler> userPropertyHandlers = userManager.getUserPropertyHandlersFor(usageIdentifyer, isAdministrativeUser);
-		identitiesTableModel = new IdentitiesOfGroupTableDataModel(views, getLocale(), userPropertyHandlers, isAdministrativeUser);
+		identitiesTableModel = new IdentitiesOfGroupTableDataModel(views, getLocale(), userPropertyHandlers);
 		tableCtr.setTableDataModel(identitiesTableModel);
 	}
 }