Skip to content
Merged
Show file tree
Hide file tree
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
18 changes: 18 additions & 0 deletions apps/trigger/serializers/task_source_trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ def edit(self, instance: Dict, with_valid=True):
valid_data = serializer.validated_data
trigger_id = self.data.get('trigger_id')
workspace_id = self.data.get('workspace_id')
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()
if not trigger:
Expand All @@ -135,6 +137,22 @@ def edit(self, instance: Dict, with_valid=True):
setattr(trigger, field, valid_data.get(field))
trigger.save()

trigger_task = valid_data.get('trigger_task')
if trigger_task is not None:
# 检查是否为空列表
if not trigger_task:
raise serializers.ValidationError(_('Trigger must have at least one task'))

TriggerTask.objects.filter(
source_id=source_id,
source_type=source_type,
trigger_id=trigger_id
).update(parameter=trigger_task[0].get("parameter"), meta=trigger_task[0].get("meta"))
else:
# 用户没提交 trigger_task 字段,确保数据库中有 task
if not TriggerTask.objects.filter(trigger_id=trigger_id).exists():
raise serializers.ValidationError(_('Trigger must have at least one task'))

if need_redeploy:
if trigger.is_active:
deploy(TriggerModelSerializer(trigger).data, **{})
Expand Down
2 changes: 1 addition & 1 deletion ui/src/layout/layout-header/SystemHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="flex-between w-full align-center">
<h4><el-divider class="ml-16 mr-16" direction="vertical" />{{ $t('views.system.title') }}</h4>
<div class="flex align-center mr-8">
<TopAbout></TopAbout>
<TopAbout type="system"></TopAbout>
<el-divider class="ml-8 mr-8" direction="vertical" />
<el-button
link
Expand Down
5 changes: 4 additions & 1 deletion ui/src/layout/layout-header/top-about/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
PermissionConst.TRIGGER_READ.getWorkspacePermissionWorkspaceManageRole,
],
'OR',
)
) && type === 'workspace'
"
effect="dark"
:content="$t('views.trigger.title')"
Expand Down Expand Up @@ -88,6 +88,9 @@ const route = useRoute()
const router = useRouter()
const { theme, user } = useStore()

withDefaults(defineProps<{ type?: 'workspace' | 'system' }>(), {
type: 'workspace',
})
function toUrl(url: string) {
window.open(url, '_blank')
}
Expand Down