From 73e95c045968b1a40b7148ff9bbbe68af9ef0a91 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 1 Feb 2021 14:34:06 +0800 Subject: [PATCH] * Fix bug. --- module/tree/control.php | 1 + module/tree/view/browse.html.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/tree/control.php b/module/tree/control.php index 90c5d8b6ac..3eb8d1bed1 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -231,6 +231,7 @@ class tree extends control $this->view->currentModuleID = $currentModuleID; $this->view->parentModules = $parentModules; $this->view->branch = $branch; + $this->view->from = $from; $this->view->tree = $this->tree->getProductStructure($rootID, $viewType); $this->view->canBeChanged = isset($canBeChanged) ? $canBeChanged : true; $this->display(); diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index b0b13ed128..7746f937ea 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -93,10 +93,10 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete]{display:none;} " . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType"), empty($root->name) ? '' : $root->name) . ""; + echo "" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType¤tModuleID=0&branch=0&from=$from"), empty($root->name) ? '' : $root->name) . ""; foreach($parentModules as $module) { - echo "" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType&moduleID=$module->id"), $module->name) . " "; + echo "" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType¤tModuleID=$module->id&branch=0&from=$from"), $module->name) . " "; } ?> @@ -194,7 +194,7 @@ $(function() }, itemCreator: function($li, item) { - var link = (item.id !== undefined && item.type != 'line') ? ('' + item.name + '') : ('' + item.name + ''); + var link = (item.id !== undefined && item.type != 'line') ? ('' + item.name + '') : ('' + item.name + ''); var $toggle = $('' + link + ''); if(item.type === 'bug') $toggle.append('  [B]'); if(item.type === 'case') $toggle.append('  [C]');