Bläddra i källkod

HUE-2369 [search] Download query should not included non selected headers

Romain Rigaux 11 år sedan
förälder
incheckning
37c80cb
2 ändrade filer med 9 tillägg och 3 borttagningar
  1. 5 1
      apps/search/src/search/data_export.py
  2. 4 2
      apps/search/src/search/models.py

+ 5 - 1
apps/search/src/search/data_export.py

@@ -49,7 +49,11 @@ def SearchDataAdapter(results, format, collection):
   """
   if results and results['response'] and results['response']['docs']:
     search_data = results['response']['docs']
-    headers = [field['name'] for field in collection['fields']]
+
+    if collection['template']['fieldsSelected']:
+      headers = collection['template']['fieldsSelected']
+    else:
+      headers = [field['name'] for field in collection['fields']]
 
     rows = []
 

+ 4 - 2
apps/search/src/search/models.py

@@ -530,8 +530,10 @@ def augment_solr_response(response, collection, query):
         value = smart_unicode(value, errors='replace')
         escaped_value = escape(value)
       doc[field] = escaped_value
-    doc['showDetails'] = False
-    doc['details'] = []
+
+    if not query['download']:
+      doc['showDetails'] = False
+      doc['details'] = []
 
   highlighted_fields = response.get('highlighting', {}).keys()
   if highlighted_fields and not query.get('download'):