Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grantnav/frontend/search_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,4 +341,4 @@ def term_parameters_from_json_query(parameters, json_query, field_name, param_na
values.append(filter['term'][field_name])
parameters[param_name] = values
if must_not:
parameters["exclude_" + param_name] = "true"
parameters["exclude_" + param_name] = ["true"]
8 changes: 6 additions & 2 deletions grantnav/frontend/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,12 @@ def create_parameters_from_json_query(json_query, **extra_parameters):
parameter_list = []

for parameter, list_value in parameters.items():
for value in list_value:
parameter_list.append((parameter, value))
if isinstance(list_value, list):
for value in list_value:
parameter_list.append((parameter, value))
else:
parameter_list.append((parameter, list_value))

for parameter, value in extra_parameters.items():
parameter_list.append((parameter, value))

Expand Down
25 changes: 25 additions & 0 deletions tests/tests_units.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
import time
import os
import copy

from django.test import TestCase, Client, RequestFactory, override_settings
from django.urls import reverse_lazy
Expand Down Expand Up @@ -446,3 +447,27 @@ def test_district_filter_ajax(self):
f"{uri}?parent_field=additional_data&child_field=recipientDistrictName&filter_search=a"
)
assert len(json.loads(response.content)["results"]) == 73

def test_exclude_fundingOrganization_parameter_encoding_bug_1232(self):
"""
Test that exclude_fundingOrganization=true doesn't get split into characters
"""

# Create a query with exclude filter (must_not)
json_query = copy.deepcopy(BASIC_QUERY)
json_query["query"]["bool"]["filter"][0]["bool"]["must_not"] = [
{"term": {"fundingOrganization.id_and_name": '["Test Funder", "org-123"]'}}
]

# Convert to URL parameters
encoded_url = create_parameters_from_json_query(json_query)

self.assertIn("exclude_fundingOrganization=true", encoded_url,
"URL should contain exclude_fundingOrganization=true as a single parameter")

# Verify the bug doesn't occur by checking individual character parameters don't exist
self.assertNotIn("exclude_fundingOrganization=t&", encoded_url,
"URL should not split 'true' into individual character parameters")
self.assertNotIn("exclude_fundingOrganization=r", encoded_url)
self.assertNotIn("exclude_fundingOrganization=u", encoded_url)
self.assertNotIn("exclude_fundingOrganization=e", encoded_url)
Loading