Commit 05556e1

committed

Resolve #39 -- Make default search more like Django admin

Different to before we now match search terms only if all bits match or the entire statement. The last part differs from the behavior in Django admin, which does not inlcude exact machtes of the entire search term inlcude spaces. Partially revert 07054b2

1 parent c093aab commit 05556e1Copy full SHA for 05556e1

File tree

2 files changed

+18

-13

lines changed

django_select2
- forms.py
tests
- test_forms.py

2 files changed

+18

-13

lines changed

`‎django_select2/forms.py‎`

Lines changed: 17 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,14 @@`
`46`	`46`	`:parts: 1`
`47`	`47`
`48`	`48`	`"""`
`49`		`-import re`
	`49`	`+import operator`
`50`	`50`	`import uuid`
	`51`	`+from functools import reduce`
`51`	`52`	`from itertools import chain`
`52`	`53`	`from pickle import PicklingError # nosec`
`53`	`54`
`54`	`55`	`from django import forms`
	`56`	`+from django.contrib.admin.utils import lookup_needs_distinct`
`55`	`57`	`from django.contrib.admin.widgets import SELECT2_TRANSLATIONS`
`56`	`58`	`from django.core import signing`
`57`	`59`	`from django.db.models import Q`
`@@ -315,8 +317,6 @@ class HeavySelect2TagWidget(HeavySelect2Mixin, Select2TagWidget):`
`315`	`317`	`class ModelSelect2Mixin:`
`316`	`318`	"""Widget mixin that provides attributes and methods for :class:`.AutoResponseView`."""
`317`	`319`
`318`		`- _word_split_pattern = re.compile(r"\t\|\n\| ")`
`319`		`-`
`320`	`320`	`model = None`
`321`	`321`	`queryset = None`
`322`	`322`	`search_fields = []`
`@@ -400,19 +400,24 @@ def filter_queryset(self, request, term, queryset=None, **dependent_fields):`
`400`	`400`	`search_fields = self.get_search_fields()`
`401`	`401`	`select = Q()`
`402`	`402`
`403`		`- if term != "":`
`404`		`- for field in search_fields:`
`405`		`- field_select = Q(**{field: term})`
`406`		`- if "contains" in field:`
`407`		`- for word in filter(None, self._word_split_pattern.split(term)):`
`408`		`- field_select \|= Q(**{field: word})`
`409`		`-`
`410`		`- select \|= field_select`
	`403`	`+ use_distinct = False`
	`404`	`+ if search_fields and term:`
	`405`	`+ for bit in term.split():`
	`406`	`+ or_queries = [Q(**{orm_lookup: bit}) for orm_lookup in search_fields]`
	`407`	`+ select &= reduce(operator.or_, or_queries)`
	`408`	`+ or_queries = [Q(**{orm_lookup: term}) for orm_lookup in search_fields]`
	`409`	`+ select \|= reduce(operator.or_, or_queries)`
	`410`	`+ use_distinct \|= any(`
	`411`	`+ lookup_needs_distinct(queryset.model._meta, search_spec)`
	`412`	`+ for search_spec in search_fields`
	`413`	`+ )`
`411`	`414`
`412`	`415`	`if dependent_fields:`
`413`	`416`	`select &= Q(**dependent_fields)`
`414`	`417`
`415`		`- return queryset.filter(select).distinct()`
	`418`	`+ if use_distinct:`
	`419`	`+ queryset.filter(select).distinct()`
	`420`	`+ return queryset.filter(select)`
`416`	`421`
`417`	`422`	`def get_queryset(self):`
`418`	`423`	`"""`

`‎tests/test_forms.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ def test_filter_queryset__contains(self, genres):`
`482`	`482`	`assert qs.exists()`
`483`	`483`
`484`	`484`	`qs = widget.filter_queryset(None, "NOT Gen")`
`485`		`- assert qs.exists(), "contains works even if only one part matches"`
	`485`	`+ assert notqs.exists(), "contains works even if all bits match"`
`486`	`486`
`487`	`487`	`def test_filter_queryset__multiple_fields(self, genres):`
`488`	`488`	`genre = Genre.objects.create(title="Space Genre")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 05556e1

File tree

2 files changed

2 files changed

`‎django_select2/forms.py‎`

`‎tests/test_forms.py‎`

0 commit comments