Changeset 7425

Timestamp:

04/14/08 23:52:39 (5 months ago)

Author:

mtredinnick

Message:

Fixed #6957 -- Removed a stray reference to QuerySet?._select_related and added
a way to copy the select_related() settings from an existing queryset.

Files:

• django/branches/queryset-refactor/django/contrib/admin/views/main.py (modified) (1 diff)
• django/branches/queryset-refactor/django/db/models/query.py (modified) (1 diff)

django/branches/queryset-refactor/django/contrib/admin/views/main.py

@@ -751 +751 @@
-                or_queries = [models.Q(**{construct_search(field_name): bit}) for field_name in self.lookup_opts.admin.search_fields]
-                other_qs = QuerySet(self.model)
-
-
+
-                other_qs = other_qs.filter(reduce(operator.or_, or_queries))
-                qs = qs & other_qs

django/branches/queryset-refactor/django/db/models/query.py

@@ -403 +403 @@
-        return obj
-
+    def dup_select_related(self, other):
+        """
+        Copies the related selection status from the queryset 'other' to the
+        current queryset.
+        """
+        self.query.select_related = other.query.select_related
+
-    def order_by(self, *field_names):
-        """Returns a new QuerySet instance with the ordering changed."""