Skip to content
Snippets Groups Projects
Commit f2a7ea6f authored by srosse's avatar srosse
Browse files

Merge remote-tracking branch 'origin/OpenOLAT_13.2'

parents 5c5be318 50ab176c
No related branches found
No related tags found
No related merge requests found
......@@ -347,6 +347,9 @@ class NewUserForm extends FormBasicController {
// special test on email address: validate if email is already used
String email = emailTextElement.getValue();
emailTextElement.clearError();
if(emailTextElement.isVisible() && emailTextElement.isEnabled()) {
emailTextElement.validate(new ArrayList<>());
}
if (!userManager.isEmailAllowed(email)) {
if (registrationManager.isRegistrationPending(email)) {
doConfirmDeletePendingRegistration(ureq, email);
......
......@@ -193,6 +193,9 @@ public class EvaluationFormExecutionController extends FormBasicController imple
&& !session.getParticipation().isAnonymous();
boolean anonymous = !notAnonymous;
flc.contextPut("anonymous", Boolean.valueOf(showDoneButton && anonymous));
// force it to have always the same settings
mainForm.setMultipartEnabled(true);
doneLink = uifactory.addFormSubmitButton("save.as.done", "save.as.done", formLayout);
saveLink = uifactory.addFormLink("save.intermediate", "save.intermediate", null, flc, Link.BUTTON);
......@@ -267,6 +270,7 @@ public class EvaluationFormExecutionController extends FormBasicController imple
protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
if (saveLink == source) {
if(mainForm.validate(ureq)) {
mainForm.forceSubmittedAndValid();
doSaveResponses();
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment