pref: 修改 asset permission

apps/perms/api/asset_permission.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-from perms.filters import AssetPermissionFilter
-from perms.models import AssetPermission
 from orgs.mixins.api import OrgBulkModelViewSet
 from perms import serializers
-
+from perms.filters import AssetPermissionFilter
+from perms.models import AssetPermission
 
 __all__ = ['AssetPermissionViewSet']
 
@@ -18,4 +17,4 @@ class AssetPermissionViewSet(OrgBulkModelViewSet):
     filterset_class = AssetPermissionFilter
     search_fields = ('name',)
     ordering_fields = ('name',)
-    ordering = ('name', )
+    ordering = ('name',)

apps/perms/api/user_permission/accounts.py

@@ -6,7 +6,6 @@ from common.utils import get_logger, lazyproperty
 from assets.serializers import AccountSerializer
 from perms.hands import User, Asset, Account
 from perms import serializers
-from perms.models import Action
 from perms.utils import PermAccountUtil
 from .mixin import RoleAdminMixin, RoleUserMixin
 
@@ -80,7 +79,7 @@ class UserGrantedAssetSpecialAccountsApi(ListAPIView):
     def get_queryset(self):
         # 构造默认包含的账号，如: @INPUT @USER
         accounts = [
-            Account.get_input_account(),
+            Account.get_manual_account(),
             Account.get_user_account(self.user.username)
         ]
         for account in accounts:

apps/perms/api/user_permission/mixin.py

@@ -3,11 +3,9 @@
 from rest_framework.request import Request
 
 from common.http import is_true
-from common.mixins.api import RoleAdminMixin
-from common.mixins.api import RoleUserMixin
-from orgs.utils import tmp_to_root_org
-from users.models import User
+from common.mixins.api import RoleAdminMixin, RoleUserMixin
 from perms.utils.user_permission import UserGrantedTreeRefreshController
+from users.models import User
 
 
 class RebuildTreeMixin: