From e7887938a9cb1b2f4c3dd2d48a7c213477f3d349 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 22 May 2019 11:39:58 +0200
Subject: [PATCH] no-jira: fix goto meeting add organizer popup
---
.../modules/gotomeeting/ui/EditOrganizerNameController.java | 2 +-
.../olat/modules/gotomeeting/ui/EditTrainingController.java | 4 ++--
.../gotomeeting/ui/GoToOrganizerListAdminController.java | 4 +++-
.../modules/gotomeeting/ui/LoginOrganizerController.java | 6 +++---
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/olat/modules/gotomeeting/ui/EditOrganizerNameController.java b/src/main/java/org/olat/modules/gotomeeting/ui/EditOrganizerNameController.java
index d9017165ac5..e8d32a10753 100644
--- a/src/main/java/org/olat/modules/gotomeeting/ui/EditOrganizerNameController.java
+++ b/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
diff --git a/src/main/java/org/olat/modules/gotomeeting/ui/EditTrainingController.java b/src/main/java/org/olat/modules/gotomeeting/ui/EditTrainingController.java
index 17f564b8701..0977a00c676 100644
--- a/src/main/java/org/olat/modules/gotomeeting/ui/EditTrainingController.java
+++ b/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
diff --git a/src/main/java/org/olat/modules/gotomeeting/ui/GoToOrganizerListAdminController.java b/src/main/java/org/olat/modules/gotomeeting/ui/GoToOrganizerListAdminController.java
index bbabbae38c7..60040f24609 100644
--- a/src/main/java/org/olat/modules/gotomeeting/ui/GoToOrganizerListAdminController.java
+++ b/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;
}
diff --git a/src/main/java/org/olat/modules/gotomeeting/ui/LoginOrganizerController.java b/src/main/java/org/olat/modules/gotomeeting/ui/LoginOrganizerController.java
index 9609bb01b61..b06a8a3507f 100644
--- a/src/main/java/org/olat/modules/gotomeeting/ui/LoginOrganizerController.java
+++ b/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
--
GitLab