Merge branch 'sprint/master_zhouxudong_18270' into 'master'

Sprint/master zhouxudong 18270

See merge request easycorp/zentaopms!2654
This commit is contained in:
孙广明
2022-03-31 03:08:33 +00:00
4 changed files with 5 additions and 26 deletions
+1 -15
View File
@@ -305,14 +305,6 @@ class executionModel extends model
$type = 'sprint';
if($project) $type = zget($this->config->execution->modelList, $project->model, 'sprint');
/* If the execution model is a stage, determine whether the product is linked. */
$products = array_filter($this->post->products);
if(empty($products))
{
dao::$errors['message'][] = $this->lang->execution->noLinkProduct;
return false;
}
$this->config->execution->create->requiredFields .= ',project';
}
@@ -468,13 +460,7 @@ class executionModel extends model
dao::$errors['days'] = sprintf($this->lang->project->workdaysExceed, $workdays);
return false;
}
$products = array_filter($this->post->products);
$noLinkTip = $oldExecution->type != 'kanban' ? $this->lang->execution->noLinkProduct : $this->lang->execution->kanbanNoLinkProduct;
if(empty($products))
{
dao::$errors['message'][] = $noLinkTip;
return false;
}
/* Get the data from the post. */
$execution = fixer::input('post')
->setDefault('lastEditedBy', $this->app->user->account)