From a1eea6940a92f8410a982e5714c765e018afc0ed Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 2 Mar 2012 11:37:23 +0100
Subject: [PATCH] OO-144: rewrite the validate methods of to take in account
the error of the text fields
--HG--
branch : 80-patch
---
.../course/editor/NodeConfigFormController.java | 3 ++-
.../RepositoryEntryDetailsFormController.java | 16 +++++++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/course/editor/NodeConfigFormController.java b/src/main/java/org/olat/course/editor/NodeConfigFormController.java
index 8870a98b727..a5956863568 100644
--- a/src/main/java/org/olat/course/editor/NodeConfigFormController.java
+++ b/src/main/java/org/olat/course/editor/NodeConfigFormController.java
@@ -26,7 +26,6 @@ import org.olat.core.gui.components.form.flexible.elements.RichTextElement;
import org.olat.core.gui.components.form.flexible.elements.SingleSelection;
import org.olat.core.gui.components.form.flexible.elements.TextElement;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
@@ -181,6 +180,8 @@ public class NodeConfigFormController extends FormBasicController {
// the short title is mandatory
shortTitle.setErrorKey("nodeConfigForm.menumust", new String[] {});
shortTitleOk = false;
+ } else if (shortTitle.hasError()) {
+ shortTitleOk = false;
}
if (shortTitleOk && super.validateFormLogic(ureq)) {
shortTitle.clearError();
diff --git a/src/main/java/org/olat/repository/RepositoryEntryDetailsFormController.java b/src/main/java/org/olat/repository/RepositoryEntryDetailsFormController.java
index 4db783802af..d3221a6dd7c 100644
--- a/src/main/java/org/olat/repository/RepositoryEntryDetailsFormController.java
+++ b/src/main/java/org/olat/repository/RepositoryEntryDetailsFormController.java
@@ -114,19 +114,25 @@ public class RepositoryEntryDetailsFormController extends FormBasicController {
@Override
protected boolean validateFormLogic(UserRequest ureq) {
// Check for empty display name
+
+ boolean allOk = true;
if (!StringHelper.containsNonWhitespace(displayName.getValue())) {
displayName.setErrorKey("cif.error.displayname.empty", new String[] {});
- return false;
+ allOk = false;
+ } else if (displayName.hasError()) {
+ allOk = false;
+ } else {
+ displayName.clearError();
}
- displayName.clearError();
// Check for empty description
if (!StringHelper.containsNonWhitespace(description.getValue())) {
description.setErrorKey("cif.error.description.empty", new String[] {});
- return false;
+ allOk = false;
+ } else {
+ description.clearError();
}
- description.clearError();
// Ok, passed all checks
- return super.validateFormLogic(ureq);
+ return allOk && super.validateFormLogic(ureq);
}
/**
--
GitLab