github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3892 from jumpserver/dev_bai 

Dev bai
pull/3954/head
BaiJiangJie 2020-04-14 13:20:50 +08:00 committed by GitHub
parent 6cdba2e8d2 55fa5800b1
commit 8fd5e6521f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/perms/api/user_permission/user_permission_assets.py
View File

@ -2,6 +2,7 @@
#
from django.shortcuts import get_object_or_404
from django.conf import settings
from rest_framework.generics import ListAPIView
from common.permissions import IsOrgAdminOrAppUser
@ -45,7 +46,9 @@ class UserGrantedAssetsApi(UserAssetPermissionMixin, ListAPIView):
return queryset
def get_queryset(self):
queryset = self.util.get_assets().only(*self.only_fields)
queryset = self.util.get_assets().only(*self.only_fields).order_by(
settings.TERMINAL_ASSET_LIST_SORT_BY
)
return queryset