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

fix: 资产更新没有账号及自动化任务更新name (#9679) 

Co-authored-by: feng <1304903146@qq.com>
pull/9680/head^2
fit2bot 2023-02-22 11:04:29 +08:00 committed by GitHub
parent d7946ccb6f
commit b9dcce5c51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/accounts/serializers/automations/base.py
View File

@ -38,6 +38,8 @@ class BaseAutomationSerializer(PeriodTaskSerializerMixin, BulkOrgResourceModelSe
} }
def validate_name(self, name): def validate_name(self, name):
if self.instance:
return name
if BaseAutomation.objects.filter(name=name, type=self.model_type).exists(): if BaseAutomation.objects.filter(name=name, type=self.model_type).exists():
raise serializers.ValidationError(_('Name already exists')) raise serializers.ValidationError(_('Name already exists'))
return name return name

2
apps/assets/serializers/asset/common.py
View File

@ -277,6 +277,8 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali
@atomic @atomic
def update(self, instance, validated_data): def update(self, instance, validated_data):
if not validated_data.get('accounts'):
validated_data.pop('accounts', None)
nodes_display = validated_data.pop('nodes_display', '') nodes_display = validated_data.pop('nodes_display', '')
instance = super().update(instance, validated_data) instance = super().update(instance, validated_data)
self.perform_nodes_display_create(instance, nodes_display) self.perform_nodes_display_create(instance, nodes_display)