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

chore: merge with dev

Browse Source
This commit is contained in:
ibuler
2021-07-30 19:18:36 +08:00
parent b43626b5a2 5e4b3e924f
commit 2ab1bbaa2c
4 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,10 +75,10 @@ class ApplicationAccountSerializer(serializers.Serializer):
app = serializers.ReadOnlyField(label=_('App'))
uid = serializers.ReadOnlyField(label=_("Union id"))
app_name = serializers.ReadOnlyField(label=_("Application name"), read_only=True)
app_category = serializers.ChoiceField(label=_('Category'), choices=const.AppCategory.choices, read_only=True)
app_category_display = serializers.SerializerMethodField(label=_('Category display'))
app_type = serializers.ChoiceField(label=_('Type'), choices=const.AppType.choices, read_only=True)
app_type_display = serializers.SerializerMethodField(label=_('Type display'))
category = serializers.ChoiceField(label=_('Category'), choices=const.AppCategory.choices, read_only=True)
category_display = serializers.SerializerMethodField(label=_('Category display'))
type = serializers.ChoiceField(label=_('Type'), choices=const.AppType.choices, read_only=True)
type_display = serializers.SerializerMethodField(label=_('Type display'))
category_mapper = dict(const.AppCategory.choices)
type_mapper = dict(const.AppType.choices)
@@ -89,11 +89,11 @@ class ApplicationAccountSerializer(serializers.Serializer):
def update(self, instance, validated_data):
pass
def get_app_category_display(self, obj):
return self.category_mapper.get(obj['app_category'])
def get_category_display(self, obj):
return self.category_mapper.get(obj['category'])
def get_app_type_display(self, obj):
return self.type_mapper.get(obj['app_type'])
def get_type_display(self, obj):
return self.type_mapper.get(obj['type'])
class ApplicationAccountSecretSerializer(ApplicationAccountSerializer):