no-jira: fix goto meeting add organizer popup

src/main/java/org/olat/modules/gotomeeting/ui/EditOrganizerNameController.java

@@ -60,8 +60,8 @@ public class EditOrganizerNameController extends FormBasicController {
 
 		FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		formLayout.add("buttons", buttonLayout);
-		uifactory.addFormSubmitButton("ok", buttonLayout);
 		uifactory.addFormCancelButton("cancel", buttonLayout, ureq, getWindowControl());
+		uifactory.addFormSubmitButton("ok", buttonLayout);
 	}
 	
 	@Override

src/main/java/org/olat/modules/gotomeeting/ui/EditTrainingController.java

@@ -153,7 +153,7 @@ public class EditTrainingController extends FormBasicController {
 
 	@Override
 	protected boolean validateFormLogic(UserRequest ureq) {
-		boolean allOk = true;
+		boolean allOk = super.validateFormLogic(ureq);
 		
 		if(meeting == null || meeting.getOrganizer() == null) {
 			organizersEl.clearError();
@@ -201,7 +201,7 @@ public class EditTrainingController extends FormBasicController {
 			}
 		}
 		
-		return allOk & super.validateFormLogic(ureq);
+		return allOk;
 	}
 
 	@Override

src/main/java/org/olat/modules/gotomeeting/ui/GoToOrganizerListAdminController.java

@@ -155,7 +155,7 @@ public class GoToOrganizerListAdminController extends FormBasicController implem
 
 	@Override
 	protected void event(UserRequest ureq, Controller source, Event event) {
-		if(editOrganizerNameController == source || loginOrganizerController == null) {
+		if(editOrganizerNameController == source || loginOrganizerController == source) {
 			if(event == Event.DONE_EVENT) {
 				updateModel();
 			}
@@ -176,9 +176,11 @@ public class GoToOrganizerListAdminController extends FormBasicController implem
 	
 	private void cleanUp() {
 		removeAsListenerAndDispose(editOrganizerNameController);
+		removeAsListenerAndDispose(loginOrganizerController);
 		removeAsListenerAndDispose(confirmRemoveOrganizer);
 		removeAsListenerAndDispose(cmc);
 		editOrganizerNameController = null;
+		loginOrganizerController = null;
 		confirmRemoveOrganizer = null;
 		cmc = null;
 	}

src/main/java/org/olat/modules/gotomeeting/ui/LoginOrganizerController.java

@@ -89,8 +89,8 @@ public class LoginOrganizerController extends FormBasicController {
 		
 		FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		formLayout.add("buttons", buttonLayout);
-		uifactory.addFormSubmitButton("ok", buttonLayout);
 		uifactory.addFormCancelButton("cancel", buttonLayout, ureq, getWindowControl());
+		uifactory.addFormSubmitButton("ok", buttonLayout);
 	}
 	
 	@Override
@@ -100,7 +100,7 @@ public class LoginOrganizerController extends FormBasicController {
 
 	@Override
 	protected boolean validateFormLogic(UserRequest ureq) {
-		boolean allOk = true;
+		boolean allOk = super.validateFormLogic(ureq);
 		
 		usernameEl.clearError();
 		if(!StringHelper.containsNonWhitespace(usernameEl.getValue())) {
@@ -114,7 +114,7 @@ public class LoginOrganizerController extends FormBasicController {
 			allOk &= false;
 		}
 		
-		return allOk & super.validateFormLogic(ureq);
+		return allOk;
 	}
 
 	@Override