Changeset 2850

Timestamp:

05/05/06 19:26:24 (2 years ago)

Author:

lukeplant

Message:

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

Files:

• django/trunk/django/contrib/admin/views/main.py (modified) (1 diff)
• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/django/db/models/fields/related.py (modified) (3 diffs)
• django/trunk/django/db/models/manager.py (modified) (1 diff)
• django/trunk/django/db/models/manipulators.py (modified) (1 diff)
• django/trunk/django/db/models/query.py (modified) (1 diff)
• django/trunk/docs/model-api.txt (modified) (1 diff)
• django/trunk/tests/modeltests/or_lookups/models.py (modified) (1 diff)

django/trunk/django/contrib/admin/views/main.py

@@ -715 +715 @@
-
-        if self.opts.one_to_one_field:
-filter(**
+complex_filter(
-
-        return qs

django/trunk/django/db/models/fields/__init__.py

@@ -296 +296 @@
-        rel_model = self.rel.to
-        return first_choice + [(x._get_pk_val(), str(x))
-filter(**
+complex_filter(
-
-    def get_choices_default(self):

django/trunk/django/db/models/fields/related.py

@@ -680 +680 @@
-        self.min_num_in_admin, self.max_num_in_admin = min_num_in_admin, max_num_in_admin
-        self.num_extra_on_change, self.related_name = num_extra_on_change, related_name
-
+
+
+
-        self.lookup_overrides = lookup_overrides or {}
-        self.raw_id_admin = raw_id_admin
@@ -696 +698 @@
-        self.num_in_admin, self.edit_inline = num_in_admin, edit_inline
-        self.related_name = related_name
-
+
+
+
-        self.lookup_overrides = lookup_overrides or {}
-        self.raw_id_admin = raw_id_admin
@@ -708 +712 @@
-        self.related_name = related_name
-        self.filter_interface = filter_interface
-
+
+
+
-        self.edit_inline = False
-        self.raw_id_admin = raw_id_admin

django/trunk/django/db/models/manager.py

@@ -69 +69 @@
-        return self.get_query_set().filter(*args, **kwargs)
-
+    def complex_filter(self, *args, **kwargs):
+        return self.get_query_set().complex_filter(*args, **kwargs)
+
-    def exclude(self, *args, **kwargs):
-        return self.get_query_set().exclude(*args, **kwargs)

django/trunk/django/db/models/manipulators.py

@@ -262 +262 @@
-                # For example, make sure the Place exists for the Restaurant.
-                # Let the ObjectDoesNotExist exception propagate up.
-ookup_kwargs
-['%s__exact' % self.opts.one_to_one_field.rel.field_name] = obj_key
-
+imit_choices_to
+ = {'%s__exact' % self.opts.one_to_one_field.rel.field_name: obj_key}
+complex_filter(limit_choices_to).
-                params = dict([(f.attname, f.get_default()) for f in self.opts.fields])
-                params[self.opts.pk.attname] = obj_key

django/trunk/django/db/models/query.py

@@ -297 +297 @@
-            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):

django/trunk/docs/model-api.txt

@@ -704 +704 @@
-                             ``pub_date`` before the current date/time to be
-                             chosen.
+
+                             Instead of a dictionary this can also be a ``Q`` object
+                             (an object with a ``get_sql()`` method) for more complex
+                             queries.
-
-                             Not compatible with ``edit_inline``.

django/trunk/tests/modeltests/or_lookups/models.py

@@ -87 +87 @@
-{1: Hello}
-
+# The 'complex_filter' method supports framework features such as 
+# 'limit_choices_to' which normally take a single dictionary of lookup arguments
+# but need to support arbitrary queries via Q objects too.
+>>> Article.objects.complex_filter({'pk': 1})
+[Hello]
+>>> Article.objects.complex_filter(Q(pk=1) | Q(pk=2))
+[Hello, Goodbye]
-"""