Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#66545,done,2h] Add tigger condition for the task actions.

Browse Source
This commit is contained in:
tianshujie
2025-11-20 15:31:07 +08:00
parent 4f5de174ab
commit e8cc68a36b
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+15 -1
View File
@@ -5003,6 +5003,18 @@ class executionModel extends model
$this->loadModel('task');
$this->app->loadConfig('project');
$flowActionConditions = array();
if($this->config->edition != 'open')
{
$this->loadModel('flow');
$flowActions = $this->loadModel('workflowaction')->getList('task');
foreach($flowActions as $flowAction)
{
if(!empty($flowAction->conditions)) $flowActionConditions[$flowAction->action] = $flowAction->conditions;
}
}
foreach($tasks as $task)
{
if(!$canModify) continue;
@@ -5024,7 +5036,9 @@ class executionModel extends model
if(!common::hasDBPriv($task, 'task', $rawAction)) continue;
$clickable = $this->task->isClickable($task, $rawAction);
$action = array('name' => $action);
if($clickable && !empty($flowActionConditions[$rawAction])) $clickable = $this->flow->checkConditions($flowActionConditions[$rawAction], $task);
$action = array('name' => $action);
if(!$clickable) $action['disabled'] = true;
$task->actions[] = $action;
}