OO-1217: separate add/remove events from the rest of events which can close...

OO-1217: separate add/remove events from the rest of events which can close the administrator management popup

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

@@ -478,14 +478,14 @@ public class GroupController extends BasicController {
 		Step start = new UsersToGroupWizardStep00(ureq, addUserMailDefaultTempl, mandatoryEmail);
 		StepRunnerCallback finish = new StepRunnerCallback() {
 			@Override
-			public Step execute(UserRequest ureq, WindowControl wControl, StepsRunContext runContext) {
+			public Step execute(UserRequest uureq, WindowControl wControl, StepsRunContext runContext) {
 				@SuppressWarnings("unchecked")
 				List<Identity> choosenIdentities = (List<Identity>)runContext.get("members");
 				MailTemplate customTemplate = (MailTemplate)runContext.get("mailTemplate");
 				if (choosenIdentities == null || choosenIdentities.size() == 0) {
 					showError("msg.selectionempty");
 				} else {
-					doAddIdentitiesToGroup(ureq, choosenIdentities, customTemplate);
+					doAddIdentitiesToGroup(uureq, choosenIdentities, customTemplate);
 				}
 				return StepsMainRunController.DONE_MODIFIED;
 			}
@@ -604,16 +604,16 @@ public class GroupController extends BasicController {
 	 * Init GroupList-table-controller for non-waitinglist (participant-list,
 	 * owner-list).
 	 */
-	protected void initGroupTable(TableController tableCtr, UserRequest ureq, boolean enableTablePreferences, boolean enableUserSelection) {			
+	protected void initGroupTable(TableController tableController, UserRequest ureq, boolean enableTablePreferences, boolean enableUserSelection) {			
 		List<UserPropertyHandler> userPropertyHandlers = userManager.getUserPropertyHandlersFor(usageIdentifyer, isAdministrativeUser);
 		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);
+			tableController.addColumnDescriptor(cd0);
 		}
 		if(chatEnabled) {
-			tableCtr.addColumnDescriptor(new CustomRenderColumnDescriptor("table.header.online", 1, COMMAND_IM, getLocale(),
+			tableController.addColumnDescriptor(new CustomRenderColumnDescriptor("table.header.online", 1, COMMAND_IM, getLocale(),
 					ColumnDescriptor.ALIGNMENT_LEFT, new OnlineIconRenderer()));
 		}
 		
@@ -629,7 +629,7 @@ public class GroupController extends BasicController {
 				dcd.setIsPopUpWindowAction(true, "height=700, width=900, location=no, menubar=no, resizable=yes, status=no, scrollbars=yes, toolbar=no");
 				
 			}
-			tableCtr.addColumnDescriptor(visible, cd);
+			tableController.addColumnDescriptor(visible, cd);
 			if (visible) {
 				visibleColId++;
 			}
@@ -639,15 +639,15 @@ public class GroupController extends BasicController {
 		if (enableTablePreferences) {
 			DefaultColumnDescriptor dcd =  new DefaultColumnDescriptor("table.subject.addeddate", 2, COMMAND_VCARD, ureq.getLocale());
 			dcd.setIsPopUpWindowAction(true, "height=700, width=900, location=no, menubar=no, resizable=yes, status=no, scrollbars=yes, toolbar=no");
-			tableCtr.addColumnDescriptor(true, dcd);
-			tableCtr.setSortColumn(++visibleColId,true);	
+			tableController.addColumnDescriptor(true, dcd);
+			tableController.setSortColumn(++visibleColId,true);	
 		}
 		if (enableUserSelection) {
-			tableCtr.addColumnDescriptor(new StaticColumnDescriptor(COMMAND_SELECTUSER, "table.subject.action", myTrans.translate("action.general")));
+			tableController.addColumnDescriptor(new StaticColumnDescriptor(COMMAND_SELECTUSER, "table.subject.action", myTrans.translate("action.general")));
 		}
 		if (mayModifyMembers) {
-			tableCtr.addMultiSelectAction("action.remove", COMMAND_REMOVEUSER);
-			tableCtr.setMultiSelect(true);
+			tableController.addMultiSelectAction("action.remove", COMMAND_REMOVEUSER);
+			tableController.setMultiSelect(true);
 		}
 	}
 

src/main/java/org/olat/catalog/ui/CatalogController.java

@@ -652,9 +652,12 @@ public class CatalogController extends BasicController implements Activateable2
 			}
 			cleanUp();
 		} else if (source == groupController) {
-			cmc.deactivate();
-			doAddOwners(event);
-			cleanUp();
+			if(event instanceof IdentitiesAddEvent || event instanceof IdentitiesRemoveEvent) {
+				doAddOwners(event);
+			} else {
+				cmc.deactivate();
+				cleanUp();
+			}
 		} else if(source == catEntryMoveController){
 			cmc.deactivate();
 			if(event.equals(Event.DONE_EVENT)){