修复 account 里面失败的测试；优化权限 decorator 的写法

account/decorators.py

@@ -1,58 +1,48 @@
 # coding=utf-8
+import functools
 from functools import wraps
-from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import render
 
-from utils.shortcuts import error_response, error_page
-from .models import User, SUPER_ADMIN
+from django.http import HttpResponseRedirect
+
+from utils.shortcuts import error_response
+from .models import SUPER_ADMIN, ADMIN
 
 
-def login_required(func):
-    @wraps(func)
-    def check(*args, **kwargs):
-        # 在class based views 里面，args 有两个元素，一个是self, 第二个才是request，
-        # 在function based views 里面，args 只有request 一个参数
+class BasePermissionDecorator(object):
+    def __init__(self, func):
+        self.func = func
+
+    def __get__(self, obj, obj_type):
+        return functools.partial(self.__call__, obj)
+
+    def __call__(self, *args, **kwargs):
         if len(args) == 2:
-            request = args[-1]
+            self.request = args[1]
         else:
-            request = args[0]
-        if request.user.is_authenticated():
-            return func(*args, **kwargs)
-        if request.is_ajax():
-            return error_response(u"请先登录")
+            self.request = args[0]
+
+        if self.check_permission():
+            return self.func(*args, **kwargs)
         else:
-            return HttpResponseRedirect("/login/")
-    return check
+            if self.request.is_ajax():
+                return error_response(u"请先登录")
+            else:
+                return HttpResponseRedirect("/login/")
+
+    def check_permission(self):
+        raise NotImplementedError()
 
 
-def admin_required(func):
-    @wraps(func)
-    def check(*args, **kwargs):
-        if len(args) == 2:
-            request = args[-1]
-        else:
-            request = args[0]
-        if request.user.is_authenticated() and request.user.admin_type:
-            return func(*args, **kwargs)
-        if request.is_ajax():
-            return error_response(u"需要管理员权限")
-        else:
-            return error_page(request, u"需要管理员权限，如果没有登录，请先登录")
-    return check
+class login_required(BasePermissionDecorator):
+    def check_permission(self):
+        return self.request.user.is_authenticated()
 
 
-def super_admin_required(func):
-    @wraps(func)
-    def check(*args, **kwargs):
-        if len(args) == 2:
-            request = args[-1]
-        else:
-            request = args[0]
-        if request.user.is_authenticated() and request.user.admin_type == SUPER_ADMIN:
-            return func(*args, **kwargs)
-        if request.is_ajax():
-            return error_response(u"需要超级管理员权限")
-        else:
-            return error_page(request, u"需要超级管理员权限")
+class super_admin_required(BasePermissionDecorator):
+    def check_permission(self):
+        return self.request.user.is_authenticated() and self.request.user.admin_type == SUPER_ADMIN
 
-    return check
+
+class admin_required(BasePermissionDecorator):
+    def check_permission(self):
+        return self.request.user.is_authenticated() and self.request.user.admin_type in [SUPER_ADMIN, ADMIN]