Ticket #12173: filterspec_or_support.patch

django/contrib/admin/views/main.py

@@ -27 +27 @@
 TO_FIELD_VAR = 't'
 IS_POPUP_VAR = 'pop'
 ERROR_FLAG = 'e'
+FILTERSPEC_OR_PREFIX = '__or__'
 
 # Text to display within change-list table cells if the value is blank.
 EMPTY_CHANGELIST_VALUE = '(None)'
@@ -87 +88 @@
         p = self.params.copy()
         for r in remove:
             for k in p.keys():
-                if k.startswith(r):
+                if k.startswith(r) or k.startswith(FILTERSPEC_OR_PREFIX):
                     del p[k]
         for k, v in new_params.items():
             if v is None:
@@ -187 +188 @@
 
         # Apply lookup parameters from the query string.
         try:
-            qs = qs.filter(**lookup_params)
+            or_params = {}
+            and_params = lookup_params
+            for key, value in lookup_params.items():
+                if key.startswith(FILTERSPEC_OR_PREFIX):
+                    or_params[key[len(FILTERSPEC_OR_PREFIX):]] = and_params.pop(key)
+
+            if or_params:
+                and_queries = [models.Q(**{key: value}) for key, value in and_params.items()]
+                or_queries = [models.Q(**{key: value}) for key, value in or_params.items()]
+                if and_queries:
+                    qs = qs.filter(reduce(operator.and_, and_queries) | reduce(operator.or_, or_queries))
+            else:
+                qs = qs.filter(**lookup_params)
+
         # Naked except! Because we don't have any other way of validating "params".
         # They might be invalid if the keyword arguments are incorrect, or if the
         # values are not in the correct type, so we might get FieldError, ValueError,
-        # ValicationError, or ? from a custom field that raises yet something else 
+        # ValidationError, or ? from a custom field that raises yet something else
         # when handed impossible data.
         except:
             raise IncorrectLookupParameters