From 67fefa8bf05699e01141c7b2ea66b9366e714515 Mon Sep 17 00:00:00 2001
From: aboeckle <alexander.boeckle@frentix.com>
Date: Wed, 8 Apr 2020 16:41:50 +0200
Subject: [PATCH] OO-4611 Fix up wrong error message
---
.../paypal/ui/PaypalAccessConfigurationController.java | 4 ++--
.../provider/token/ui/TokenAccessConfigurationController.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/PaypalAccessConfigurationController.java b/src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/PaypalAccessConfigurationController.java
index 5466336c4c8..4111809e029 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/PaypalAccessConfigurationController.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/PaypalAccessConfigurationController.java
@@ -213,10 +213,10 @@ public class PaypalAccessConfigurationController extends AbstractConfigurationMe
allOk = false;
}
- if (dateFrom.getValue() != null && dateTo.getValue() != null && dateFrom.getValue().compareTo(dateTo.getValue()) > 0) {
+ if (dateFrom.getDate() != null && dateTo.getDate() != null && dateFrom.getDate().compareTo(dateTo.getDate()) > 0) {
dateTo.setErrorKey("date.error", null);
dateFrom.setErrorKey(null, null);
- allOk = false;
+ allOk &= false;
}
return allOk;
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/token/ui/TokenAccessConfigurationController.java b/src/main/java/org/olat/resource/accesscontrol/provider/token/ui/TokenAccessConfigurationController.java
index d55fb2570f3..de3501d6b4c 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/token/ui/TokenAccessConfigurationController.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/token/ui/TokenAccessConfigurationController.java
@@ -113,10 +113,10 @@ public class TokenAccessConfigurationController extends AbstractConfigurationMet
allOk = false;
}
- if (dateFrom.getValue() != null && dateTo.getValue() != null && dateFrom.getValue().compareTo(dateTo.getValue()) > 0) {
+ if (dateFrom.getDate() != null && dateTo.getDate() != null && dateFrom.getDate().compareTo(dateTo.getDate()) > 0) {
dateTo.setErrorKey("date.error", null);
dateFrom.setErrorKey(null, null);
- allOk = false;
+ allOk &= false;
}
return allOk && super.validateFormLogic(ureq);
--
GitLab