From 57e9a3d88cd2d89ddef659382a2b577653f11f51 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 5 Jul 2017 16:38:45 +0200
Subject: [PATCH] OO-2709: strip time for the now parameter as the booking
doesn't contain any time informations
---
.../manager/ACFrontendManager.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/resource/accesscontrol/manager/ACFrontendManager.java b/src/main/java/org/olat/resource/accesscontrol/manager/ACFrontendManager.java
index 3784ae097ff..25fb462c3e9 100644
--- a/src/main/java/org/olat/resource/accesscontrol/manager/ACFrontendManager.java
+++ b/src/main/java/org/olat/resource/accesscontrol/manager/ACFrontendManager.java
@@ -33,6 +33,7 @@ import java.util.Set;
import org.olat.basesecurity.GroupRoles;
import org.olat.basesecurity.IdentityRef;
+import org.olat.commons.calendar.CalendarUtils;
import org.olat.core.commons.persistence.DB;
import org.olat.core.commons.persistence.SortKey;
import org.olat.core.id.Identity;
@@ -145,7 +146,8 @@ public class ACFrontendManager implements ACService {
return new AccessResult(true);
}
- List<Offer> offers = accessManager.findOfferByResource(entry.getOlatResource(), true, new Date());
+ Date now = dateNow();
+ List<Offer> offers = accessManager.findOfferByResource(entry.getOlatResource(), true, now);
if(offers.isEmpty()) {
if(methodManager.isValidMethodAvailable(entry.getOlatResource(), null)) {
//not open for the moment: no valid offer at this date but some methods are defined
@@ -202,8 +204,9 @@ public class ACFrontendManager implements ACService {
return new AccessResult(true);
}
+ Date now = dateNow();
OLATResource resource = OLATResourceManager.getInstance().findResourceable(group);
- List<Offer> offers = accessManager.findOfferByResource(resource, true, new Date());
+ List<Offer> offers = accessManager.findOfferByResource(resource, true, now);
if(offers.isEmpty()) {
if(methodManager.isValidMethodAvailable(resource, null)) {
//not open for the moment: no valid offer at this date but some methods are defined
@@ -258,7 +261,8 @@ public class ACFrontendManager implements ACService {
if(resourceTypes.size() == 1) {
resourceType = resourceTypes.iterator().next();
}
- return methodManager.getAccessMethodForResources(resourceKeys, resourceType, "BusinessGroup", true, new Date());
+ Date now = dateNow();
+ return methodManager.getAccessMethodForResources(resourceKeys, resourceType, "BusinessGroup", true, now);
}
@Override
@@ -277,7 +281,8 @@ public class ACFrontendManager implements ACService {
if(resourceTypes.size() == 1) {
resourceType = resourceTypes.iterator().next();
}
- return methodManager.getAccessMethodForResources(resourceKeys, resourceType, "BusinessGroup", true, new Date());
+ Date now = dateNow();
+ return methodManager.getAccessMethodForResources(resourceKeys, resourceType, "BusinessGroup", true, now);
}
@Override
@@ -707,5 +712,11 @@ public class ACFrontendManager implements ACService {
}
}
+ /**
+ * @return The current date without time
+ */
+ private Date dateNow() {
+ return CalendarUtils.removeTime(new Date());
+ }
}
--
GitLab