* finish task #4659.

This commit is contained in:
wangyidong
2018-08-07 16:30:00 +08:00
parent 4a8805f424
commit 1bcbddf649
2 changed files with 5 additions and 6 deletions
+1 -1
View File
@@ -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)
{
+4 -5
View File
@@ -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();