Merge pull request #8221 from 4teamwork/ran/TI-3357/dossier-report-subdossiers

Remove is_subdossier false filter if include_children is selected

Author: Acrop146

changes/TI-3357.other

@@ -0,0 +1 @@
+Mass dossier export with subdossier always includes subdosiers. [ran]

opengever/base/browser/reporting_view.py

@@ -131,7 +131,7 @@ def get_selected_items(self):
         if paths:
             self._extend_selected_items_query_by_paths(solr_query, paths, include_children=include_children)
         elif listing_name:
-            self._extend_selected_items_query_by_listing(solr_query, listing_name)
+            self._extend_selected_items_query_by_listing(solr_query, listing_name, include_children=include_children)
 
         for batch in batched_solr_results(**solr_query):
             for doc in batch:
@@ -164,11 +164,14 @@ def _extend_selected_items_query_by_paths(self, solr_query, paths, include_child
 
         solr_query['fq'] = filter_queries
 
-    def _extend_selected_items_query_by_listing(self, solr_query, listing_name):
+    def _extend_selected_items_query_by_listing(self, solr_query, listing_name, include_children=False):
         listing = queryMultiAdapter((self.context, self.request), name="GET_application_json_@listing")
         listing.listing_name = listing_name
         query, filters, start, rows, sort, field_list, params = listing.prepare_solr_query(self.request.form)
 
+        if include_children:
+            filters = [f for f in filters if not f.startswith(u'is_subdossier:')]
+
         solr_query['sort'] = sort
         solr_query['query'] = query
         solr_query['filters'] = filters