|
@@ -6,7 +6,7 @@ from rest_framework.decorators import action
|
|
from django.db import transaction
|
|
from django.db import transaction
|
|
from rest_framework.views import APIView
|
|
from rest_framework.views import APIView
|
|
from rest_framework.serializers import ValidationError
|
|
from rest_framework.serializers import ValidationError
|
|
-from utils.permission import permission_required, isLogin
|
|
|
|
|
|
+from utils.permission import permission_required, isLogin, check_permission
|
|
from django.contrib.auth.models import Group, Permission
|
|
from django.contrib.auth.models import Group, Permission
|
|
from rest_framework_jwt.views import ObtainJSONWebToken,VerifyJSONWebToken,RefreshJSONWebToken
|
|
from rest_framework_jwt.views import ObtainJSONWebToken,VerifyJSONWebToken,RefreshJSONWebToken
|
|
from utils import response_error, response_ok
|
|
from utils import response_error, response_ok
|
|
@@ -83,9 +83,9 @@ class EmployeeViewSet(CustomModelViewSet):
|
|
u'删除账号[%s],id=%d' % (instance.username, instance.id))
|
|
u'删除账号[%s],id=%d' % (instance.username, instance.id))
|
|
super(EmployeeViewSet, self).perform_destroy(instance)
|
|
super(EmployeeViewSet, self).perform_destroy(instance)
|
|
|
|
|
|
- # @permission_required('account.check_user')
|
|
|
|
@action(methods=['post'], detail=True)
|
|
@action(methods=['post'], detail=True)
|
|
def join(self, request, pk):
|
|
def join(self, request, pk):
|
|
|
|
+ check_permission(request, 'account.check_user')
|
|
try:
|
|
try:
|
|
with transaction.atomic():
|
|
with transaction.atomic():
|
|
instance = self.get_object()
|
|
instance = self.get_object()
|