Tweaked new staff decorator to make tests pass

oscar/apps/dashboard/app.py

@@ -1,6 +1,5 @@
 from django.conf.urls.defaults import patterns, url, include
-#from django.contrib.admin.views.decorators import staff_member_required
-from oscar.apps.customer.decorators import staff_member_required
+from oscar.views.decorators import staff_member_required
 
 from oscar.core.application import Application
 from oscar.apps.dashboard.reports.app import application as reports_app

oscar/views/decorators.py

@@ -2,29 +2,26 @@ import urlparse
 
 from functools import wraps
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.core.urlresolvers import reverse
 
 
-def staff_member_required(view_func, login_url=None):
+def staff_member_required(view_func, login_url='/accounts/login/'):
     """
     Decorator for views that checks that the user is logged in and is a staff
     member. The user is redirected to the login page specified by *login_url*
     if not authenticated.
+
     This decorator is based on the admin decorator provided by the the django
     ``auth`` and ``admin`` packages.
     """
-    if login_url:
-        login_url = reverse('login')
 
     @wraps(view_func)
     def _checklogin(request, *args, **kwargs):
         if request.user.is_active and request.user.is_staff:
-            # The user is a valid staff member, continue to the redirect URL
             return view_func(request, *args, **kwargs)
 
-        path = request.build_absolute_uri()
         # If the login url is the same scheme and net location then just
         # use the path as the "next" url.
+        path = request.build_absolute_uri()
         login_scheme, login_netloc = urlparse.urlparse(login_url)[:2]
         current_scheme, current_netloc = urlparse.urlparse(path)[:2]
         if ((not login_scheme or login_scheme == current_scheme) and
@@ -33,4 +30,5 @@ def staff_member_required(view_func, login_url=None):
 
         from django.contrib.auth.views import redirect_to_login
         return redirect_to_login(path, login_url, REDIRECT_FIELD_NAME)
+
     return _checklogin