mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-22 10:12:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #1579 - added support for 'Q' objects in limit_choices_to.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2006-05-06 00:26:24 +00:00
parent 3f932e31dc
commit f57e34e990
8 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
django/db/models/query.py
View file

@ -297,6 +297,17 @@ class QuerySet(object):
clone._filters = clone._filters & reduce(operator.and_, args)
return clone
def complex_filter(self, filter_obj):
"""Returns a new QuerySet instance with filter_obj added to the filters.
filter_obj can be a Q object (has 'get_sql' method) or a dictionary of
keyword lookup arguments."""
# This exists to support framework features such as 'limit_choices_to',
# and usually it will be more natural to use other methods.
if hasattr(filter_obj, 'get_sql'):
return self._filter_or_exclude(None, filter_obj)
else:
return self._filter_or_exclude(Q, **filter_obj)
def select_related(self, true_or_false=True):
"Returns a new QuerySet instance with '_select_related' modified."
return self._clone(_select_related=true_or_false)