From 55fa5800b1eb3d7bfc92b90be26518983b4df973 Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 14 Apr 2020 13:18:33 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E7=BB=88=E7=AB=AF=E8=AE=BE=E7=BD=AE-?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=8E=92=E5=BA=8F=E8=AE=BE=E7=BD=AE=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api/user_permission/user_permission_assets.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/perms/api/user_permission/user_permission_assets.py b/apps/perms/api/user_permission/user_permission_assets.py index 82f46dd6f..389c06bdc 100644 --- a/apps/perms/api/user_permission/user_permission_assets.py +++ b/apps/perms/api/user_permission/user_permission_assets.py @@ -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