moanos/Notfellchen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: has search criteria had twisted logic

Browse Source
This commit is contained in:
moanos [he/him]
2025-09-06 14:08:30 +02:00
parent a5754b2633
commit 0df36df9d8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fellchensammlung/tools/search.py
View File

@@ -86,7 +86,7 @@ class AdoptionNoticeSearch:
Returns true if there are any restrictions on which adoption notices are searched. Returns true if there are any restrictions on which adoption notices are searched.
If all adoption notices fit the search, return True If all adoption notices fit the search, return True
""" """
return self.sex is None and self.area_search is None return self.sex is not None or self.area_search is not None
def adoption_notice_fits_search(self, adoption_notice: AdoptionNotice): def adoption_notice_fits_search(self, adoption_notice: AdoptionNotice):
# Make sure sex is set and sex is not set to all (then it can be disregarded) # Make sure sex is set and sex is not set to all (then it can be disregarded)

4
src/tests/test_views/test_search.py
View File

@@ -106,5 +106,5 @@ class SearchTest(TestCase):
# We can't use assertContains because TestAdoption3 will always be in response at is included in map # We can't use assertContains because TestAdoption3 will always be in response at is included in map
# In order to test properly, we need to only care for the context that influences the list display # In order to test properly, we need to only care for the context that influences the list display
an_names = [a.name for a in response.context["adoption_notices"]] an_names = [a.name for a in response.context["adoption_notices"]]
self.assertTrue("TestAdoption1" in an_names) # Adoption in Berlin self.assertTrue("TestAdoption1" in an_names) # Adoption in Berlin should be included
self.assertFalse("TestAdoption3" in an_names) # Adoption in Stuttgart self.assertFalse("TestAdoption3" in an_names) # Adoption in Stuttgart should not be included