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

fix: 修复系统平台不能导入的问题

pull/8687/head
Jiangjie.Bai 2022-08-02 14:47:53 +08:00 committed by Jiangjie.Bai
parent 9319c4748c
commit 9ff345747b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/assets/api/asset.py
View File

@ -6,7 +6,7 @@ from django.shortcuts import get_object_or_404
from django.db.models import Q from django.db.models import Q
from common.utils import get_logger, get_object_or_none from common.utils import get_logger, get_object_or_none
from common.mixins.api import SuggestionMixin from common.mixins.api import SuggestionMixin, RenderToJsonMixin
from users.models import User, UserGroup from users.models import User, UserGroup
from users.serializers import UserSerializer, UserGroupSerializer from users.serializers import UserSerializer, UserGroupSerializer
from users.filters import UserFilter from users.filters import UserFilter
@ -88,7 +88,7 @@ class AssetPlatformRetrieveApi(RetrieveAPIView):
return asset.platform return asset.platform
class AssetPlatformViewSet(ModelViewSet): class AssetPlatformViewSet(ModelViewSet, RenderToJsonMixin):
queryset = Platform.objects.all() queryset = Platform.objects.all()
serializer_class = serializers.PlatformSerializer serializer_class = serializers.PlatformSerializer
filterset_fields = ['name', 'base'] filterset_fields = ['name', 'base']

3
apps/assets/serializers/asset.py
View File

@ -189,6 +189,9 @@ class PlatformSerializer(serializers.ModelSerializer):
'id', 'name', 'base', 'charset', 'id', 'name', 'base', 'charset',
'internal', 'meta', 'comment' 'internal', 'meta', 'comment'
] ]
extra_kwargs = {
'internal': {'read_only': True},
}
class AssetSimpleSerializer(serializers.ModelSerializer): class AssetSimpleSerializer(serializers.ModelSerializer):