github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-25 14:50:24 +00:00
Code Issues Projects Releases Wiki Activity

perf(perms): 添加应用/应用授权API的type_display/category_display字段

Browse Source
This commit is contained in:
Bai
2020-10-28 12:44:19 +08:00
committed by 老广
parent 77c8ca5863
commit abe32e6c79
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/applications/serializers/application.py
View File

@@ -1,6 +1,7 @@
# coding: utf-8
#
from rest_framework import serializers
from orgs.mixins.serializers import BulkOrgResourceModelSerializer
from .. import models
@@ -11,10 +12,13 @@ __all__ = [
class ApplicationSerializer(BulkOrgResourceModelSerializer):
category_display = serializers.ReadOnlyField(source='get_category_display')
type_display = serializers.ReadOnlyField(source='get_type_display')
class Meta:
model = models.Application
fields = [
'id', 'name', 'category', 'type', 'get_type_display', 'attrs',
'id', 'name', 'category', 'category_display', 'type', 'type_display', 'attrs',
'domain', 'created_by', 'date_created', 'date_updated', 'comment'
]
read_only_fields = [

3
apps/perms/api/application/application_permission.py
View File

@@ -12,7 +12,8 @@ class ApplicationPermissionViewSet(OrgBulkModelViewSet):
"""
model = ApplicationPermission
serializer_class = serializers.ApplicationPermissionSerializer
filter_fields = ['name']
filter_fields = ['name', 'category', 'type']
search_fields = filter_fields
permission_classes = (IsOrgAdmin,)
def get_queryset(self):

6
apps/perms/serializers/application/permission.py
View File

@@ -12,6 +12,8 @@ __all__ = [
class ApplicationPermissionSerializer(BulkOrgResourceModelSerializer):
category_display = serializers.ReadOnlyField(source='get_category_display')
type_display = serializers.ReadOnlyField(source='get_type_display')
is_valid = serializers.BooleanField(read_only=True)
is_expired = serializers.BooleanField(read_only=True)
@@ -19,8 +21,8 @@ class ApplicationPermissionSerializer(BulkOrgResourceModelSerializer):
model = ApplicationPermission
mini_fields = ['id', 'name']
small_fields = mini_fields + [
'is_active', 'is_expired', 'is_valid', 'created_by', 'date_created',
'date_expired', 'date_start', 'comment'
'category', 'category_display', 'type', 'type_display', 'is_active', 'is_expired',
'is_valid', 'created_by', 'date_created', 'date_expired', 'date_start', 'comment'
]
m2m_fields = [
'users', 'user_groups', 'applications', 'system_users',