From 5153fdc5c9ff89d19e6e3db92c07be0cb007d530 Mon Sep 17 00:00:00 2001
From: Emilio Dolce <emilio.dolce@micegroup.it>
Date: Wed, 16 Jan 2019 14:00:51 +0100
Subject: [PATCH] Pass form to evalutate association rule

---
 .../springmvc/security/FilteredRoleAndOperationVoter.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/voila-runtime-springmvc/src/main/java/it/mice/voila/runtime/springmvc/security/FilteredRoleAndOperationVoter.java b/voila-runtime-springmvc/src/main/java/it/mice/voila/runtime/springmvc/security/FilteredRoleAndOperationVoter.java
index 94432191..62eff3d2 100644
--- a/voila-runtime-springmvc/src/main/java/it/mice/voila/runtime/springmvc/security/FilteredRoleAndOperationVoter.java
+++ b/voila-runtime-springmvc/src/main/java/it/mice/voila/runtime/springmvc/security/FilteredRoleAndOperationVoter.java
@@ -30,7 +30,9 @@ import it.mice.voila.runtime.util.UserMessages;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -298,7 +300,11 @@ public class FilteredRoleAndOperationVoter extends AbstractVoter implements Acce
         StringBuffer propertySetters = preparePropertySetters(userProfileGrantedAuthority, authentication, null, null);
         if (logger.isDebugEnabled())
             logger.debug("Evaluating profile association using velocity engine for: " + userProfileGrantedAuthority);
-        String velocityResult = evaluateVelocityTemplate(null, profileAssociationRule, propertySetters, authentication, userProfileGrantedAuthority);
+
+        Map<String, Object> map = new HashMap<String, Object>();
+		map.put("form", SpringMvcUtil.getFormFromSession());
+
+        String velocityResult = evaluateVelocityTemplate(map, profileAssociationRule, propertySetters, authentication, userProfileGrantedAuthority);
         if (velocityResult == null || velocityResult.trim().length() == 0) {
             return true;
         } else {
-- 
GitLab