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

fix: 修复remote app没有返回asset的bug

pull/6660/head
ibuler 2021-08-17 11:06:16 +08:00 committed by Jiangjie.Bai
parent 7d7da9bf98
commit dba416f5eb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/applications/api/account.py
View File

@ -31,11 +31,11 @@ class ApplicationAccountViewSet(JMSModelViewSet):
filterset_class = AccountFilterSet filterset_class = AccountFilterSet
filterset_fields = ['username', 'app_name', 'type', 'category'] filterset_fields = ['username', 'app_name', 'type', 'category']
serializer_class = serializers.ApplicationAccountSerializer serializer_class = serializers.ApplicationAccountSerializer
http_method_names = ['get', 'put', 'patch', 'options'] http_method_names = ['get', 'put', 'patch', 'options']
def get_queryset(self): def get_queryset(self):
queryset = ApplicationPermission.objects.exclude(system_users__isnull=True) \ queryset = ApplicationPermission.objects\
.exclude(system_users__isnull=True) \
.exclude(applications__isnull=True) \ .exclude(applications__isnull=True) \
.annotate(uid=Concat( .annotate(uid=Concat(
'applications', Value('_'), 'system_users', output_field=CharField() 'applications', Value('_'), 'system_users', output_field=CharField()

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

@ -14,7 +14,7 @@ logger = get_logger(__file__)
__all__ = ['RemoteAppSerializer'] __all__ = ['RemoteAppSerializer']
class AssetCharPrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField): class ExistAssetPrimaryKeyRelatedField(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)
@ -26,14 +26,14 @@ class AssetCharPrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField):
return self.pk_field.to_representation(_id) return self.pk_field.to_representation(_id)
# 解决删除资产后，远程应用更新页面会显示资产ID的问题 # 解决删除资产后，远程应用更新页面会显示资产ID的问题
asset = get_object_or_none(Asset, id=_id) asset = get_object_or_none(Asset, id=_id)
if asset: if not asset:
return None return None
return _id return _id
class RemoteAppSerializer(serializers.Serializer): class RemoteAppSerializer(serializers.Serializer):
asset_info = serializers.SerializerMethodField() asset_info = serializers.SerializerMethodField()
asset = AssetCharPrimaryKeyRelatedField( asset = ExistAssetPrimaryKeyRelatedField(
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(