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

Merge branch 'master' into sprint/biz17

Browse Source
This commit is contained in:
liugang
2022-11-21 13:08:59 +08:00
parent 05ae463eab cfc43ece4f
commit 7c62eef9dc
621 changed files with 18018 additions and 6726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/control.php
+17 -3
View File
@@ -109,7 +109,7 @@ class tree extends control
if($viewType == 'story')
{
/* Set menu.*/
$products = $this->product->getPairs();
$products = $this->product->getPairs($mode = '', $programID = 0, $append = '', 'all');
$this->product->saveState($rootID, $products);
unset($products[$rootID]);
@@ -303,6 +303,12 @@ class tree extends control
}
}
if($this->app->tab == 'project' and strpos($viewType, 'doc') === false)
{
$project = $this->loadModel('project')->getByID($this->session->project);
if(empty($project->hasProduct)) $this->view->root->name = $project->name;
}
$this->view->title = $title;
$this->view->position = $position;
$this->view->rootID = $rootID;
@@ -402,20 +408,28 @@ class tree extends control
$this->view->branch = $branch;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted', $module->owner);
$showProduct = strpos('story|bug|case', $type) !== false ? true : false;
$this->view->showProduct = $showProduct;
$showProduct = strpos('story|bug|case', $type) !== false ? true : false;
if($showProduct)
{
$product = $this->loadModel('product')->getById($module->root);
if($product->type != 'normal') $this->view->branches = $this->loadModel('branch')->getPairs($module->root, 'withClosed');
$this->view->product = $product;
$this->view->products = $this->product->getPairs('', $product->program);
if($product->shadow) $showProduct = false;
}
$this->view->showProduct = $showProduct;
/* Remove self and childs from the $optionMenu. Because it's parent can't be self or childs. */
$childs = $this->tree->getAllChildId($moduleID);
foreach($childs as $childModuleID) unset($this->view->optionMenu[$childModuleID]);
$this->view->hiddenProduct = false;
if($this->app->tab == 'project')
{
$project = $this->loadModel('project')->getByID($this->session->project);
$this->view->hiddenProduct = empty($project->hasProduct);
}
$this->display();
}