conforms references to results to response_obj.results, re #10804

archesproject · Apr 19, 2024 · e5b2adc · e5b2adc
1 parent b8bc867
commit e5b2adc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/arches/app/search/components/paging_filter.py b/arches/app/search/components/paging_filter.py
@@ -32,15 +32,15 @@ def append_dsl(self, search_results_object, permitted_nodegroups, include_provis
         search_results_object["query"].start = limit * int(page - 1)
         search_results_object["query"].limit = limit
 
-    def post_search_hook(self, search_results_object, results, permitted_nodegroups):
+    def post_search_hook(self, search_results_object, response_object, permitted_nodegroups):
         total = (
-            results["hits"]["total"]["value"]
-            if results["hits"]["total"]["value"] <= settings.SEARCH_RESULT_LIMIT
+            response_object["results"]["hits"]["total"]["value"]
+            if response_object["results"]["hits"]["total"]["value"] <= settings.SEARCH_RESULT_LIMIT
             else settings.SEARCH_RESULT_LIMIT
         )
         page = 1 if self.request.GET.get(details["componentname"]) == "" else int(self.request.GET.get(details["componentname"], 1))
 
-        paginator, pages = get_paginator(self.request, results, total, page, settings.SEARCH_ITEMS_PER_PAGE)
+        paginator, pages = get_paginator(self.request, response_object["results"], total, page, settings.SEARCH_ITEMS_PER_PAGE)
         page = paginator.page(page)
 
         ret = {}

diff --git a/arches/app/search/components/search_results.py b/arches/app/search/components/search_results.py
@@ -53,13 +53,13 @@ def append_dsl(self, search_results_object, permitted_nodegroups, include_provis
         nested_agg.add_aggregation(nested_agg_filter)
         search_results_object["query"].add_aggregation(nested_agg)
 
-    def post_search_hook(self, search_results_object, results, permitted_nodegroups):
+    def post_search_hook(self, search_results_object, response_object, permitted_nodegroups):
         user_is_reviewer = user_is_resource_reviewer(self.request.user)
 
         # only reuturn points and geometries a user is allowed to view
         geojson_nodes = get_nodegroups_by_datatype_and_perm(self.request, "geojson-feature-collection", "read_nodegroup")
 
-        for result in results["hits"]["hits"]:
+        for result in response_object["results"]["hits"]["hits"]:
             result["_source"]["points"] = select_geoms_for_results(result["_source"]["points"], geojson_nodes, user_is_reviewer)
             result["_source"]["geometries"] = select_geoms_for_results(result["_source"]["geometries"], geojson_nodes, user_is_reviewer)
             try: