Merge pull request #7905 from EricSoroos/7736-to_take_search_param_ma…

…ster Fix queries when state is in fq_list
ckan · Nov 24, 2023 · dcdb7e7 · dcdb7e7
2 parents 5eea0c3 + 6039ddd
commit dcdb7e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changes/7905.bugfix b/changes/7905.bugfix
@@ -0,0 +1 @@
+Changed dataset query to check for `+state:` in the `fq_list` as well as the `fq` parameter before forcing `state:active`
diff --git a/ckan/lib/search/query.py b/ckan/lib/search/query.py
@@ -365,7 +365,7 @@ def run(self,
         fq.append('+site_id:%s' % solr_literal(config.get('ckan.site_id')))
 
         # filter for package status
-        if not '+state:' in query.get('fq', ''):
+        if not any('+state:' in _item for _item in fq):
             fq.append('+state:active')
 
         # only return things we should be able to see