From d2e3aed0e3e5a63c3a7acbe1e1d83bee689f9e14 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Tue, 9 Nov 2021 12:10:05 +0100
Subject: [PATCH] XWIKI-19120: Hibernate exception when performing LiveTable
queries on different list parameters
* Ensure to not reuse an old velocity parameter for the offset when
building query params for DBListProperty and StringListProperty
---
.../src/main/resources/XWiki/LiveTableResultsMacros.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/src/main/resources/XWiki/LiveTableResultsMacros.xml b/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/src/main/resources/XWiki/LiveTableResultsMacros.xml
index 5274c4a9396..eda0baeffad 100644
--- a/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/src/main/resources/XWiki/LiveTableResultsMacros.xml
+++ b/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/src/main/resources/XWiki/LiveTableResultsMacros.xml
@@ -936,7 +936,7 @@
#set ($paramPrefix = $NULL)
#end
#end
- #set ($filterQuery = "#livetable_getFilterQuery($matchTarget $matchType true $filterValues.size() $paramPrefix)")
+ #set ($filterQuery = "#livetable_getFilterQuery($matchTarget $matchType true $filterValues.size() $paramPrefix $NULL)")
#set ($whereSql = "$whereSql and ($filterQuery.trim())")
#foreach ($filterValue in $filterValues)
#livetable_addFilterParam($filterValue $matchType $whereParams "${paramPrefix}${foreach.count}")
@@ -960,7 +960,7 @@
#end
## As noted above, we have to use the like operator because the list of values is saved concatenated, so from the
## point of view of the query the match type is always partial.
- #set ($filterQuery = "#livetable_getFilterQuery($matchTarget 'partial' false $filterValues.size() $paramPrefix)")
+ #set ($filterQuery = "#livetable_getFilterQuery($matchTarget 'partial' false $filterValues.size() $paramPrefix $NULL)")
#set ($whereSql = "${whereSql} and ($filterQuery.trim())")
#foreach ($filterValue in $filterValues)
#if ($matchTypes.get($foreach.index) == 'empty')
--
GitLab