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

fix: 修复删除远程应用关联资产后，更新页面显示资产ID的问题

pull/6629/head
Bai 2021-08-11 11:18:18 +08:00 committed by Jiangjie.Bai
parent 1db0e28346
commit 363baece4f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/applications/serializers/attrs/application_category/remote_app.py
View File

@ -5,7 +5,7 @@ from rest_framework import serializers
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from common.utils import get_logger, is_uuid from common.utils import get_logger, is_uuid, get_object_or_none
from assets.models import Asset from assets.models import Asset
logger = get_logger(__file__) logger = get_logger(__file__)
@ -14,22 +14,26 @@ logger = get_logger(__file__)
__all__ = ['RemoteAppSerializer'] __all__ = ['RemoteAppSerializer']
class CharPrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField): class AssetCharPrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField):
def to_internal_value(self, data): def to_internal_value(self, data):
instance = super().to_internal_value(data) instance = super().to_internal_value(data)
return str(instance.id) return str(instance.id)
def to_representation(self, value): def to_representation(self, _id):
# value is instance.id # _id 是 instance.id
if self.pk_field is not None: if self.pk_field is not None:
return self.pk_field.to_representation(value) return self.pk_field.to_representation(_id)
return value # 解决删除资产后，远程应用更新页面会显示资产ID的问题
asset = get_object_or_none(Asset, id=_id)
if asset:
return None
return _id
class RemoteAppSerializer(serializers.Serializer): class RemoteAppSerializer(serializers.Serializer):
asset_info = serializers.SerializerMethodField() asset_info = serializers.SerializerMethodField()
asset = CharPrimaryKeyRelatedField( asset = AssetCharPrimaryKeyRelatedField(
queryset=Asset.objects, required=False, label=_("Asset"), allow_null=True queryset=Asset.objects, required=False, label=_("Asset"), allow_null=True
) )
path = serializers.CharField( path = serializers.CharField(