From 1bcbddf64965ede57bedb0ffe2f8567857994bea Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 7 Aug 2018 16:30:00 +0800 Subject: [PATCH] * finish task #4659. --- module/project/model.php | 2 +- module/tree/model.php | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index ecd4abb46b..c565b1f76d 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2701,7 +2701,7 @@ class projectModel extends model */ public function getProjectTree($projectID) { - $fullTrees = $this->loadModel('tree')->getTaskStructure($projectID, 0, $manage = false); + $fullTrees = $this->loadModel('tree')->getTaskStructure($projectID, 0); array_unshift($fullTrees, array('id' => 0, 'name' => '/', 'type' => 'task', 'actions' => false, 'root' => $projectID)); foreach($fullTrees as $i => $tree) { diff --git a/module/tree/model.php b/module/tree/model.php index 3bf232b540..d013246deb 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -483,11 +483,10 @@ class treeModel extends model * Get full task tree * @param integer $projectID, common value is project id * @param integer $productID - * @param integer $moduleID * @access public - * @return object + * @return array */ - public function getTaskStructure($rootID, $productID = 0, $manage = true) + public function getTaskStructure($rootID, $productID = 0) { $extra = array('projectID' => $rootID, 'productID' => $productID, 'tip' => true); @@ -502,8 +501,8 @@ class treeModel extends model return $this->getDataStructure($stmt, 'task'); } - /* if not manage, only get linked modules and ignore others. */ - $projectModules = $manage ? array() : $this->getTaskTreeModules($rootID, true); + /* only get linked modules and ignore others. */ + $projectModules = $this->getTaskTreeModules($rootID, true); /* Get module according to product. */ $fullTrees = array();