diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 3ca59f44a8..4ed14ad14d 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -210,7 +210,7 @@ $lang->scrum->menu->projectplan = array('link' => "{$lang->productplan->shortCom $lang->scrum->menu->doc = array('link' => "{$lang->doc->common}|doc|projectSpace|objectID=%s", 'subModule' => 'doc,api'); $lang->scrum->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport', 'exclude' => 'execution-create,execution-batchedit'); $lang->scrum->menu->devops = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo'); -$lang->scrum->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s", 'subModule' => 'projectbuild'); +$lang->scrum->menu->build = array('link' => "{$lang->build->common}|projectbuild|browse|project=%s", 'subModule' => 'projectbuild'); $lang->scrum->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease'); $lang->scrum->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic|project=%s"); $lang->scrum->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'tree,stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team', 'exclude' => 'tree-browsetask'); @@ -262,7 +262,7 @@ $lang->waterfall->menu->design = array('link' => "{$lang->design->common}|de $lang->waterfall->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport'); $lang->waterfall->menu->doc = array('link' => "{$lang->doc->common}|doc|projectSpace|objectID=%s"); $lang->waterfall->menu->devops = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo'); -$lang->waterfall->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s", 'subModule' => 'projectbuild'); +$lang->waterfall->menu->build = array('link' => "{$lang->build->common}|projectbuild|browse|project=%s", 'subModule' => 'projectbuild'); $lang->waterfall->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease'); $lang->waterfall->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic|project=%s"); $lang->waterfall->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team', 'exclude' => 'tree-browsetask'); @@ -306,7 +306,7 @@ $lang->waterfall->menu->design['subMenu']->bysearch = array('link' => 'kanban->common}|project|index|project=%s"); -$lang->kanbanProject->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s", 'subModule' => 'projectbuild'); +$lang->kanbanProject->menu->build = array('link' => "{$lang->build->common}|projectbuild|browse|project=%s", 'subModule' => 'projectbuild'); $lang->kanbanProject->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'tree,stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team'); $lang->kanbanProject->dividerMenu = ''; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 1a4b1758d2..d90bc4ab29 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -187,7 +187,6 @@ $lang->resource->project->addWhitelist = 'addWhitelist'; $lang->resource->project->unbindWhitelist = 'unbindWhitelist'; $lang->resource->project->manageProducts = 'manageProducts'; $lang->resource->project->dynamic = 'dynamic'; -$lang->resource->project->build = 'build'; $lang->resource->project->qa = 'qa'; $lang->resource->project->bug = 'bug'; $lang->resource->project->testcase = 'testcase'; @@ -228,18 +227,17 @@ $lang->project->methodOrder[115] = 'unbindWhitelist'; $lang->project->methodOrder[120] = 'manageProducts'; $lang->project->methodOrder[125] = 'view'; $lang->project->methodOrder[130] = 'dynamic'; -$lang->project->methodOrder[135] = 'build'; -$lang->project->methodOrder[140] = 'qa'; -$lang->project->methodOrder[145] = 'bug'; -$lang->project->methodOrder[150] = 'testcase'; -$lang->project->methodOrder[155] = 'testtask'; -$lang->project->methodOrder[160] = 'testreport'; -$lang->project->methodOrder[165] = 'execution'; -$lang->project->methodOrder[170] = 'export'; -$lang->project->methodOrder[175] = 'updateOrder'; -$lang->project->methodOrder[180] = 'team'; -$lang->project->methodOrder[185] = 'unlinkMember'; -$lang->project->methodOrder[190] = 'manageRepo'; +$lang->project->methodOrder[135] = 'qa'; +$lang->project->methodOrder[140] = 'bug'; +$lang->project->methodOrder[145] = 'testcase'; +$lang->project->methodOrder[150] = 'testtask'; +$lang->project->methodOrder[155] = 'testreport'; +$lang->project->methodOrder[160] = 'execution'; +$lang->project->methodOrder[165] = 'export'; +$lang->project->methodOrder[170] = 'updateOrder'; +$lang->project->methodOrder[175] = 'team'; +$lang->project->methodOrder[180] = 'unlinkMember'; +$lang->project->methodOrder[185] = 'manageRepo'; $lang->resource->projectbuild = new stdclass(); $lang->resource->projectbuild->browse = 'browse'; diff --git a/module/project/control.php b/module/project/control.php index 7ec9d24580..efefdbe554 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -1436,10 +1436,13 @@ class project extends control $products = $this->product->getProducts($projectID, 'all', '', false); $products = array('' => '') + $products; + + $fromModule = $this->app->tab == 'project' ? 'projectbuild' : 'project'; + $fromMethod = $this->app->tab == 'project' ? 'browse' : 'build'; /* Build the search form. */ $type = strtolower($type); $queryID = ($type == 'bysearch') ? (int)$param : 0; - $actionURL = $this->createLink('project', 'build', "projectID=$projectID&type=bysearch&queryID=myQueryID"); + $actionURL = $this->createLink($fromModule, $fromMethod, "projectID=$projectID&type=bysearch&queryID=myQueryID"); $devel = $project->model == 'waterfall' ? true : false; $executions = $this->loadModel('execution')->getByProject($projectID, 'all', '', true, $devel); @@ -1514,6 +1517,8 @@ class project extends control $this->view->buildPairs = $this->loadModel('build')->getBuildPairs(0); $this->view->type = $type; $this->view->showBranch = $showBranch; + $this->view->fromModule = $fromModule; + $this->view->fromMethod = $fromMethod; $this->display(); } diff --git a/module/project/js/build.js b/module/project/js/build.js index 23c21fa95c..0c6f514ae7 100644 --- a/module/project/js/build.js +++ b/module/project/js/build.js @@ -7,7 +7,7 @@ */ function changeProduct(productID) { - link = createLink('project', 'build', 'projectID=' + projectID + '&type=product¶m=' + productID); + link = createLink(fromModule, fromMethod, 'projectID=' + projectID + '&type=product¶m=' + productID); location.href = link; } diff --git a/module/project/model.php b/module/project/model.php index 565734be8d..1ee37eb913 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -681,7 +681,9 @@ class projectModel extends model } else { - $link = helper::createLink('project', 'build', "projectID=%s"); + $fromModule = $this->app->tab == 'project' ? 'projectbuild' : 'project'; + $fromMethod = $this->app->tab == 'project' ? 'browse' : 'build'; + $link = helper::createLink($fromModule, $fromMethod, "projectID=%s"); } } elseif($module == 'projectrelease') diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index 6b4a0966b3..6d7542d6ff 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -15,6 +15,8 @@ project->noDevStage)?> project->createExecution)?> build->confirmDelete)?> + +