Issue #97 i.e. allow for MultiPath Queries (#98)

Changes for bugfix #97 - making PATH_INDICES dynamic
plone · Jul 14, 2020 · 6ba125e · 6ba125e
1 parent 41a906f
commit 6ba125e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/news/97.bugfix b/news/97.bugfix
@@ -0,0 +1 @@
+Fixing issue #97: Multiple path support for Translation Groups, using PATH_INDICES as suggested by jensens
diff --git a/plone/app/querystring/queryparser.py b/plone/app/querystring/queryparser.py
@@ -14,6 +14,7 @@
 
 
 Row = namedtuple('Row', ['index', 'operator', 'values'])
+PATH_INDICES = {'path'}
 
 
 def parseFormquery(context, formquery, sort_on=None, sort_order=None):
@@ -41,8 +42,15 @@ def parseFormquery(context, formquery, sort_on=None, sort_order=None):
         kwargs = parser(context, row)
 
         # Special path handling - since multipath queries are possible
-        if 'path' in query and 'path' in kwargs:
-            query['path']['query'].extend(kwargs['path']['query'])
+        path_index = PATH_INDICES & set(kwargs)
+        if len(path_index) == 1:
+            path_index = list(path_index)[0]
+            if path_index in query:
+                query[path_index]['query'].extend(kwargs[path_index]['query'])
+            else:
+                query.update(kwargs)
+        elif len(path_index) > 1:
+            raise IndexError("Too many path indices in one row.")
         else:
             query.update(kwargs)