Skip to content

Commit e655031

Browse files
committed
fix: Tool for deleting association relationships that have not been deleted
1 parent 7a039b7 commit e655031

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

apps/tools/serializers/tool.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,8 @@ def delete(self):
643643
QuerySet(File).filter(id=tool.code).delete()
644644
QuerySet(WorkspaceUserResourcePermission).filter(target=tool.id).delete()
645645
QuerySet(Tool).filter(id=self.data.get('id')).delete()
646-
ResourceMapping.objects.filter(target_id=self.data.get('id')).delete()
646+
ResourceMapping.objects.filter(
647+
Q(target_id=self.data.get('id')) | Q(source_id=self.data.get('id'))).delete()
647648
QuerySet(ToolRecord).filter(tool_id=self.data.get('id')).delete()
648649
trigger_ids = list(
649650
QuerySet(TriggerTask).filter(
@@ -1445,7 +1446,7 @@ def batch_delete(self, instance: Dict, with_valid=True):
14451446
QuerySet(File).filter(id=tool.code).delete()
14461447

14471448
QuerySet(WorkspaceUserResourcePermission).filter(target__in=id_list).delete()
1448-
QuerySet(ResourceMapping).filter(target_id__in=id_list).delete()
1449+
QuerySet(ResourceMapping).filter(Q(target_id__in=id_list) | Q(source_id__in=id_list)).delete()
14491450
QuerySet(ToolRecord).filter(tool_id__in=id_list).delete()
14501451

14511452
trigger_ids = list(

ui/src/views/tool-workflow/execution-record/ExecutionDetailDrawer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<img :src="resetUrl(props.currentContent?.tool_icon)" alt="" />
129129
</el-avatar>
130130
<ToolIcon v-else :size="24" type="WORKFLOW" />
131-
<h4 class="ml-8">{{ props.currentContent?.tool_name }}</h4>
131+
<h4 class="ml-8">{{ props.currentContent?.source_name }}</h4>
132132
</div>
133133
<div class="flex align-center">
134134
<span class="mr-16 color-secondary" v-if="detail?.state !== 'STARTED'"

0 commit comments

Comments
 (0)