diff --git a/module/execution/control.php b/module/execution/control.php index 49d60b863f..4f3995c7cd 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -207,6 +207,7 @@ class execution extends control $this->view->moduleTree = $this->tree->getTaskTreeMenu($executionID, (int)$productID, 0, array('treeModel', 'createTaskLink'), $showAllModule); $this->view->memberPairs = $memberPairs; $this->view->execution = $execution; + $this->view->productID = $productID; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->features = $this->execution->getExecutionFeatures($execution); diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php index 1b903f2bdb..b359cd1f37 100644 --- a/module/execution/ui/task.html.php +++ b/module/execution/ui/task.html.php @@ -128,12 +128,13 @@ toolbar ); /* zin: Define the sidebar in main content. */ +$activeKey = $browseType == 'byproduct' ? $productID : $moduleID; sidebar ( moduleMenu ( set::modules($moduleTree), - set::activeKey($moduleID), + set::activeKey($activeKey), set::settingLink(createLink('tree', 'browsetask', "rootID=$execution->id&productID=0")), set::settingApp($execution->multiple ? 'execution' : 'project'), set::closeLink(createLink('execution', 'task', "executionID={$executionID}")),