Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/trigger/serializers/trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from knowledge.serializers.common import BatchSerializer
from maxkb.conf import PROJECT_DIR
from tools.models import Tool
from trigger.models import TriggerTypeChoices, Trigger, TriggerTaskTypeChoices, TriggerTask
from trigger.models import TriggerTypeChoices, Trigger, TriggerTaskTypeChoices, TriggerTask, TaskRecord


class BatchActiveSerializer(serializers.Serializer):
Expand Down Expand Up @@ -401,7 +401,7 @@ def batch_delete(self, instance: Dict, with_valid=True):
self.is_valid(raise_exception=True)
workspace_id = self.data.get("workspace_id")
trigger_id_list = instance.get("id_list")

TaskRecord.objects.filter(trigger_id__in=trigger_id_list).delete()
TriggerTask.objects.filter(trigger_id__in=trigger_id_list).delete()
Trigger.objects.filter(workspace_id=workspace_id, id__in=trigger_id_list).delete()

Expand Down Expand Up @@ -469,6 +469,7 @@ def edit(self, instance: Dict, with_valid=True):
def delete(self):
self.is_valid(raise_exception=True)
trigger_id = self.data.get('trigger_id')
TaskRecord.objects.filter(trigger_id=trigger_id).delete()
TriggerTask.objects.filter(trigger_id=trigger_id).delete()
Trigger.objects.filter(id=trigger_id).delete()
return True
Expand Down