From 9698a7c0e9ae75445636ceeab0cb32be40134162 Mon Sep 17 00:00:00 2001
From: Chris <chris.godwin.ala@gmail.com>
Date: Fri, 8 Sep 2023 09:17:11 +1000
Subject: [PATCH] Improve pre-pop filter context fieldcapture#2981

---
 grails-app/assets/javascripts/forms.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/grails-app/assets/javascripts/forms.js b/grails-app/assets/javascripts/forms.js
index 8410b58..686147d 100644
--- a/grails-app/assets/javascripts/forms.js
+++ b/grails-app/assets/javascripts/forms.js
@@ -611,7 +611,8 @@ function orEmptyArray(v) {
                         }
                         result = _.filter(result, function(item) {
                             var expression = conf.filter.expression;
-                            return ecodata.forms.expressionEvaluator().evaluateBoolean(expression, item);
+                            var itemContext = _.extend({}, item, {$context:context, $config:config});
+                            return ecodata.forms.expressionEvaluator.evaluateBoolean(expression, itemContext);
                         });
                     }
                     if (mapping) {