Fixed the new admin bits to not explode on Django 1.1.

Author: toastdriven

haystack/admin.py

@@ -11,7 +11,15 @@
 try:
     from django.contrib.admin.options import csrf_protect_m
 except ImportError:
-    raise ImproperlyConfigured("Using the ``SearchModelAdmin`` requires Django 1.1+.")
+    from haystack.utils.decorators import method_decorator
+    
+    # Do nothing on Django 1.1 and below.
+    def csrf_protect(view):
+        def wraps(request, *args, **kwargs):
+            return view(request, *args, **kwargs)
+        return wraps
+    
+    csrf_protect_m = method_decorator(csrf_protect)
 
 
 class SearchChangeList(ChangeList):
@@ -97,7 +105,7 @@ def changelist_view(self, request, extra_context=None):
             'action_form': action_form,
             'actions_on_top': self.actions_on_top,
             'actions_on_bottom': self.actions_on_bottom,
-            'actions_selection_counter': self.actions_selection_counter,
+            'actions_selection_counter': getattr(self, 'actions_selection_counter', 0),
         }
         context.update(extra_context or {})
         context_instance = template.RequestContext(request, current_app=self.admin_site.name)

haystack/utils/decorators.py

@@ -0,0 +1,24 @@
+# Backport of Django 1.2's ``django.utils.decorators``.
+try:
+    from functools import wraps, update_wrapper, WRAPPER_ASSIGNMENTS
+except ImportError:
+    from django.utils.functional import wraps, update_wrapper, WRAPPER_ASSIGNMENTS  # Python 2.4 fallback.
+
+
+def method_decorator(decorator):
+    """
+    Converts a function decorator into a method decorator
+    """
+    def _dec(func):
+        def _wrapper(self, *args, **kwargs):
+            def bound_func(*args2, **kwargs2):
+                return func(self, *args2, **kwargs2)
+            # bound_func has the signature that 'decorator' expects i.e.  no
+            # 'self' argument, but it is a closure over self so it can call
+            # 'func' correctly.
+            return decorator(bound_func)(*args, **kwargs)
+        return wraps(func)(_wrapper)
+    update_wrapper(_dec, decorator)
+    # Change the name to aid debugging.
+    _dec.__name__ = 'method_decorator(%s)' % decorator.__name__
+    return _dec