From e43da3d6e18754786f3700fcce3fb1d708c41be1 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 2 Jul 2019 10:51:48 +0800
Subject: [PATCH] ipython

---
 apps/perms/api/user_permission.py         | 25 ++++++++++-------------
 apps/perms/serializers/user_permission.py |  7 ++++++-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/apps/perms/api/user_permission.py b/apps/perms/api/user_permission.py
index 5117c8098..73aba47f3 100644
--- a/apps/perms/api/user_permission.py
+++ b/apps/perms/api/user_permission.py
@@ -8,7 +8,7 @@ from django.conf import settings
 from django.shortcuts import get_object_or_404
 from rest_framework.views import APIView, Response
 from rest_framework.generics import (
-    ListAPIView, get_object_or_404,
+    ListAPIView, get_object_or_404, GenericAPIView, RetrieveAPIView
 )
 from rest_framework.pagination import LimitOffsetPagination
 
@@ -433,13 +433,14 @@ class ValidateUserAssetPermissionApi(UserPermissionCacheMixin, APIView):
         return Response({'msg': True}, status=200)
 
 
-class GetUserAssetPermissionActionsApi(UserPermissionCacheMixin, APIView):
+class GetUserAssetPermissionActionsApi(UserPermissionCacheMixin, RetrieveAPIView):
     permission_classes = (IsOrgAdminOrAppUser,)
+    serializers_class = serializers.ActionsSerializer
 
-    def get(self, request, *args, **kwargs):
-        user_id = request.query_params.get('user_id', '')
-        asset_id = request.query_params.get('asset_id', '')
-        system_id = request.query_params.get('system_user_id', '')
+    def get_object(self):
+        user_id = self.request.query_params.get('user_id', '')
+        asset_id = self.request.query_params.get('asset_id', '')
+        system_id = self.request.query_params.get('system_user_id', '')
 
         user = get_object_or_404(User, id=user_id)
         asset = get_object_or_404(Asset, id=asset_id)
@@ -447,12 +448,8 @@ class GetUserAssetPermissionActionsApi(UserPermissionCacheMixin, APIView):
 
         util = AssetPermissionUtil(user, cache_policy=self.cache_policy)
         granted_assets = util.get_assets()
-        granted_system_users = granted_assets.get(asset, [])
-        _su = next((s for s in granted_system_users if s.id == su.id), None)
-        if not _su:
-            return Response({'actions': []}, status=403)
-
-        actions = [action.name for action in getattr(_su, 'actions', [])]
-        return Response({'actions': actions}, status=200)
-
+        granted_system_users = granted_assets.get(asset, {})
 
+        if su not in granted_system_users:
+            return {"actions": 0}
+        return granted_system_users[su]
diff --git a/apps/perms/serializers/user_permission.py b/apps/perms/serializers/user_permission.py
index 1653667b6..43cf47136 100644
--- a/apps/perms/serializers/user_permission.py
+++ b/apps/perms/serializers/user_permission.py
@@ -11,6 +11,7 @@ from .asset_permission import ActionField
 __all__ = [
     'AssetPermissionNodeSerializer', 'GrantedNodeSerializer',
     'NodeGrantedSerializer', 'AssetGrantedSerializer',
+    'ActionsSerializer',
 ]
 
 
@@ -110,4 +111,8 @@ class GrantedNodeSerializer(serializers.ModelSerializer):
         model = Node
         fields = [
             'id', 'name', 'key', 'value',
-        ]
\ No newline at end of file
+        ]
+
+
+class ActionsSerializer(serializers.Serializer):
+    actions = ActionField(read_only=True)
\ No newline at end of file