From 3681bfc015fdb9020ecc99e6ef3d6effc4a032af Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 17 Sep 2019 17:46:18 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=BB=84=E6=8E=88=E6=9D=83api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/perms/api/mixin.py                 | 13 +++++++++++--
 apps/perms/api/user_group_permission.py | 13 +------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/apps/perms/api/mixin.py b/apps/perms/api/mixin.py
index dd5678a7c..fba8155ae 100644
--- a/apps/perms/api/mixin.py
+++ b/apps/perms/api/mixin.py
@@ -8,14 +8,14 @@ from assets.utils import LabelFilterMixin
 from common.permissions import IsValidUser, IsOrgAdminOrAppUser
 from common.utils import get_logger
 from orgs.utils import set_to_root_org
-from ..hands import User, Asset, SystemUser
+from ..hands import User, UserGroup, Asset, SystemUser
 from .. import serializers
 
 
 logger = get_logger(__name__)
 
 __all__ = [
-    'UserPermissionMixin',
+    'UserPermissionMixin', 'UserGroupPermissionMixin',
 ]
 
 
@@ -45,6 +45,15 @@ class UserPermissionMixin:
         return super().get_permissions()
 
 
+class UserGroupPermissionMixin:
+    obj = None
+
+    def get_obj(self):
+        user_group_id = self.kwargs.get('pk', '')
+        user_group = get_object_or_404(UserGroup, id=user_group_id)
+        return user_group
+
+
 class GrantAssetsMixin(LabelFilterMixin):
     serializer_class = serializers.AssetGrantedSerializer
 
diff --git a/apps/perms/api/user_group_permission.py b/apps/perms/api/user_group_permission.py
index 7d93724c3..73e191bc7 100644
--- a/apps/perms/api/user_group_permission.py
+++ b/apps/perms/api/user_group_permission.py
@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 #
 
-from django.shortcuts import get_object_or_404
-
-from ..hands import UserGroup
 
 from . import user_permission as uapi
+from .mixin import UserGroupPermissionMixin
 
 __all__ = [
     'UserGroupGrantedAssetsApi', 'UserGroupGrantedNodesApi',
@@ -17,15 +15,6 @@ __all__ = [
 ]
 
 
-class UserGroupPermissionMixin:
-    obj = None
-
-    def get_object(self):
-        user_group_id = self.kwargs.get('pk', '')
-        user_group = get_object_or_404(UserGroup, id=user_group_id)
-        return user_group
-
-
 class UserGroupGrantedAssetsApi(UserGroupPermissionMixin, uapi.UserGrantedAssetsApi):
     pass