diff --git a/module/bug/control.php b/module/bug/control.php index e982938b20..65a3f1e459 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -285,6 +285,9 @@ class bug extends control /* Whether there is a object to transfer bug, for example feedback. */ $extras = str_replace(array(',', ' '), array('&', ''), $extras); parse_str($extras, $output); + + if(isset($output['executionID'])) commonModel::setAppObjectID('execution', $output['executionID']); + foreach($output as $paramKey => $paramValue) { if(isset($this->config->bug->fromObjects[$paramKey])) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 0514656a39..0cf5e0b076 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -343,13 +343,13 @@ $lang->execution->menu->kanban = array('link' => 'Kanban|execution|kanban|exec $lang->execution->menu->burn = array('link' => 'Burndown|execution|burn|executionID=%s'); $lang->execution->menu->view = array('link' => 'View|execution|grouptask|executionID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover'); $lang->execution->menu->story = array('link' => 'Story|execution|story|executionID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->execution->menu->bug = array('link' => 'Bug|execution|bug|executionID=%s'); -$lang->execution->menu->build = array('link' => 'Build|execution|build|executionID=%s', 'subModule' => 'build'); -$lang->execution->menu->testtask = array('link' => 'Request|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask'); +$lang->execution->menu->qa = array('link' => 'Bug|execution|qa|executionID=%s', 'subModule' => 'bug', 'alias' => 'qa,bug,testcase,testtask,testreport'); +$lang->execution->menu->repo = array('link' => 'Repo|repo|browse|projectID=%s'); $lang->execution->menu->doc = array('link' => 'Doc|doc|objectLibs|type=execution&objectID=%s&from=execution', 'subModule' => 'doc'); -$lang->execution->menu->product = $lang->productCommon . '|execution|manageproducts|executionID=%s'; -$lang->execution->menu->team = array('link' => 'Team|execution|team|executionID=%s', 'alias' => 'managemembers'); -$lang->execution->menu->more = array('link' => 'More|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'edit', 'class' => 'dropdown dropdown-hover'); +$lang->execution->menu->build = array('link' => 'Build|execution|build|executionID=%s', 'subModule' => 'build'); +$lang->execution->menu->release = array('link' => 'Release|projectrelease|browse|project=%s'); +$lang->execution->menu->action = array('link' => 'Dynamics|execution|dynamic|executionID=%s'); +$lang->execution->menu->setting = array('link' => 'Settings|execution|view|executionID=%s', 'subModule' => 'personnel', 'alias' => 'edit,manageproducts,team,whitelist,addwhitelist,managemembers', 'class' => 'dropdown dropdown-hover'); $lang->execution->subMenu = new stdclass(); $lang->execution->subMenu->view = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 709be038eb..8661dc8202 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -343,7 +343,7 @@ $lang->execution->menu->kanban = array('link' => '看板|execution|kanban|exec $lang->execution->menu->burn = array('link' => '燃尽图|execution|burn|executionID=%s'); $lang->execution->menu->view = array('link' => '视图|execution|grouptask|executionID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover'); $lang->execution->menu->story = array('link' => "{$lang->SRCommon}|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->execution->menu->qa = array('link' => '测试|execution|qa|', 'alias' => 'qa,bug,testcase,testtask,testreport'); +$lang->execution->menu->qa = array('link' => '测试|execution|qa|executionID=%s', 'subModule' => 'bug', 'alias' => 'qa,bug,testcase,testtask,testreport'); $lang->execution->menu->repo = array('link' => '代码|repo|browse|projectID=%s'); $lang->execution->menu->doc = array('link' => '文档|doc|objectLibs|type=execution&objectID=%s&from=execution', 'subModule' => 'doc'); $lang->execution->menu->build = array('link' => '版本|execution|build|executionID=%s', 'subModule' => 'build'); diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php index 1e579d6dfb..e1970283e3 100644 --- a/module/execution/view/bug.html.php +++ b/module/execution/view/bug.html.php @@ -22,7 +22,7 @@