Skip to content

fix: The resource-side trigger adds current resource validation. #4703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaohuzhang1 merged 1 commit into from
Jan 26, 2026
Merged

fix: The resource-side trigger adds current resource validation. #4703

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions apps/trigger/serializers/task_source_trigger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ def insert(self, instance, with_valid=True):
self.is_valid(raise_exception=True)
if not len(instance.get("trigger_task")) == 1:
raise AppApiException(500, _('Trigger task number must be one'))
source_id = instance.get('source_id')
source_type = instance.get('source_type')
source_trigger_task = instance.get('trigger_task')[0]
if not (instance.get('source_id') == source_id and source_trigger_task.get('source_type') == source_type):
raise AppApiException(500, _('Incorrect trigger task'))

return TriggerSerializer(data={
'workspace_id': self.data.get('workspace_id'),
Expand Down Expand Up @@ -135,11 +140,11 @@ def delete(self):
source_id = self.data.get('source_id')
source_type = self.data.get('source_type')

trigger = Trigger.objects.filter(workspace_id=workspace_id,id=trigger_id).first()
trigger = Trigger.objects.filter(workspace_id=workspace_id, id=trigger_id).first()
if not trigger:
raise AppApiException(404, _('Trigger not found'))
delete_count = TriggerTask.objects.filter(trigger_id=trigger_id, source_id=source_id,
source_type=source_type).delete()[0]
source_type=source_type).delete()[0]
if delete_count == 0:
raise AppApiException(404, _('Task not found'))
has_other_tasks = TriggerTask.objects.filter(trigger_id=trigger_id).exists()
Expand All @@ -148,6 +153,7 @@ def delete(self):
trigger.delete()
return True


class TaskSourceTriggerListSerializer(serializers.Serializer):
workspace_id = serializers.CharField(required=True, label=_('workspace id'))
source_type = serializers.CharField(required=True, label=_('source type'))
Expand Down