修复用户禁用功能的部分bug

This commit is contained in:
spxcds
2016-03-27 18:29:58 +08:00
parent 7a841214d4
commit 485462d702
5 changed files with 10 additions and 10 deletions

View File

@@ -24,7 +24,10 @@ class BasePermissionDecorator(object):
if self.check_permission():
if self.request.user.is_forbidden is True:
return error_page(self.request, u"用户被禁用,请联系管理员")
if self.request.is_ajax():
return error_response(u"您已被禁用,请联系管理员")
else:
return error_page(self.request, u"您已被禁用,请联系管理员")
return self.func(*args, **kwargs)
else:
if self.request.is_ajax():

View File

@@ -51,7 +51,7 @@ class EditUserSerializer(serializers.Serializer):
admin_type = serializers.IntegerField(default=0)
openapi = serializers.BooleanField()
tfa_auth = serializers.BooleanField()
is_forbidden_user = serializers.BooleanField()
is_forbidden = serializers.BooleanField()
class ApplyResetPasswordSerializer(serializers.Serializer):

View File

@@ -229,10 +229,7 @@ class UserAdminAPIView(APIView):
user.tfa_token = rand_str()
# 后台控制用户是否被禁用
if data["is_forbidden_user"] is False:
user.is_forbidden = False
else:
user.is_forbidden = True
user.is_forbidden = data["is_forbidden"]
user.save()
return success_response(UserSerializer(user).data)