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

Merge branch 'sprint/290_liumengyi_32244' into 'master'

Browse Source 
* Fix bug #32244, #32245, #32249, #32251,  #32255, #32179, @32167.

See merge request easycorp/zentaopms!6989
This commit is contained in:
王怡栋
2023-02-20 01:16:52 +00:00
parent bc4efa791c fb57e0f994
commit c004967af9
12 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -1900,7 +1900,7 @@ class execution extends control
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed');
$this->view->copyExecution = isset($copyExecution) ? $copyExecution : '';
$this->view->from = $this->app->tab;
$this->view->isStage = (isset($project->model) and $project->model == 'waterfall') ? true : false;
$this->view->isStage = (isset($project->model) and ($project->model == 'waterfall' or $project->model == 'waterfallplus')) ? true : false;
$this->view->project = $project;
$this->view->division = !empty($project) ? $project->division : 1;
$this->view->type = $type;