diff --git a/framework/router.class.php b/framework/router.class.php index 16757777e8..460c30cf28 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -208,7 +208,7 @@ class router extends baseRouter $model = new stdclass(); $model->model = 'scrum'; - if($this->session->PRJ) $model = $this->dbh->query('SELECT model FROM' . TABLE_PROJECT . "WHERE id = {$this->session->PRJ}")->fetch(); + //if($this->session->PRJ) $model = $this->dbh->query('SELECT model FROM' . TABLE_PROJECT . "WHERE id = {$this->session->PRJ}")->fetch(); $iterationKey = $projectKey; if(isset($model->model) && $model->model == 'waterfall') $projectKey = STAGE_KEY; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index cef13b8a91..372158f140 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -170,8 +170,6 @@ $lang->product->dividerMenu = $config->URAndSR ? ',requirement,set,' : ',track,s $lang->project->homeMenu = new stdclass(); $lang->project->homeMenu->browse = array('link' => ($config->systemMode == 'new' ? $lang->project->list : $lang->executionCommon) . '|project|browse|', 'alias' => 'batchedit,create'); -$lang->project->dividerMenu = ',execution,programplan,doc,dynamic,'; - /* Scrum menu. */ $lang->scrum->menu = new stdclass(); $lang->scrum->menu->index = array('link' => "{$lang->dashboard}|project|index|project=%s"); @@ -185,6 +183,8 @@ $lang->scrum->menu->release = array('link' => "{$lang->release->common}|projec $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' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); +$lang->scrum->dividerMenu = ',execution,programplan,doc,dynamic,'; + /* Scrum menu order. */ $lang->scrum->menuOrder[5] = 'index'; $lang->scrum->menuOrder[10] = 'execution'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index e67b079dbc..26c147b698 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -167,23 +167,24 @@ if($config->systemMode == 'new') $lang->resource->program->unbindWhitelist = 'unbindWhitelist'; $lang->resource->program->export = 'export'; - $lang->program->methodOrder[10] = 'browse'; - $lang->program->methodOrder[15] = 'product'; - $lang->program->methodOrder[20] = 'create'; - $lang->program->methodOrder[25] = 'edit'; - $lang->program->methodOrder[30] = 'view'; - $lang->program->methodOrder[35] = 'start'; - $lang->program->methodOrder[40] = 'suspend'; - $lang->program->methodOrder[45] = 'close'; - $lang->program->methodOrder[50] = 'activate'; - $lang->program->methodOrder[55] = 'delete'; - $lang->program->methodOrder[60] = 'project'; - $lang->program->methodOrder[65] = 'stakeholder'; - $lang->program->methodOrder[67] = 'createStakeholder'; - $lang->program->methodOrder[70] = 'unlinkStakeholder'; - $lang->program->methodOrder[75] = 'batchUnlinkStakeholders'; - $lang->program->methodOrder[80] = 'export'; - $lang->program->methodOrder[85] = 'unbindWhitelist'; + $lang->program->methodOrder[5] = 'browse'; + $lang->program->methodOrder[10] = 'view'; + $lang->program->methodOrder[15] = 'product'; + $lang->program->methodOrder[20] = 'create'; + $lang->program->methodOrder[25] = 'edit'; + $lang->program->methodOrder[30] = 'view'; + $lang->program->methodOrder[35] = 'start'; + $lang->program->methodOrder[40] = 'suspend'; + $lang->program->methodOrder[45] = 'activate'; + $lang->program->methodOrder[50] = 'close'; + $lang->program->methodOrder[55] = 'delete'; + $lang->program->methodOrder[60] = 'project'; + $lang->program->methodOrder[65] = 'stakeholder'; + $lang->program->methodOrder[70] = 'createStakeholder'; + $lang->program->methodOrder[75] = 'unlinkStakeholder'; + $lang->program->methodOrder[80] = 'batchUnlinkStakeholders'; + $lang->program->methodOrder[85] = 'unbindWhitelist'; + $lang->program->methodOrder[90] = 'export'; /* Project. */ $lang->resource->project = new stdclass(); diff --git a/module/project/model.php b/module/project/model.php index 04b820635b..3583f803ce 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1607,8 +1607,9 @@ class projectModel extends model public function setMenu($objectID) { $project = $this->getByID($objectID); - $this->lang->project->menu = $this->lang->{$project->model}->menu; - $this->lang->project->menuOrder = $this->lang->{$project->model}->menuOrder; + $this->lang->project->menu = $this->lang->{$project->model}->menu; + $this->lang->project->menuOrder = $this->lang->{$project->model}->menuOrder; + $this->lang->project->dividerMenu = $this->lang->{$project->model}->dividerMenu; $this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod); common::setMenuVars('project', $objectID); diff --git a/module/projectstory/control.php b/module/projectstory/control.php index 7251244514..f9fde8c05d 100644 --- a/module/projectstory/control.php +++ b/module/projectstory/control.php @@ -52,14 +52,12 @@ class projectStory extends control * @access public * @return void */ - public function track($productID = 0, $branch = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function track($projectID = 0, $productID = 0, $branch = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1) { - if(empty($productID)) $productID = key($this->products); + $products = $this->loadModel('product')->getProductPairsByProject($projectID); + if(empty($productID)) $productID = key($products); - $this->lang->story->requirement = str_replace($this->lang->URCommon, $this->lang->URCommon, $this->lang->story->requirement); - $this->lang->story->story = str_replace($this->lang->SRCommon, $this->lang->SRCommon, $this->lang->story->story); - - echo $this->fetch('story', 'track', "productID=$productID&branch=$branch&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); + echo $this->fetch('story', 'track', "productID=$productID&branch=$branch&projectID=$projectID&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); } /** diff --git a/module/story/control.php b/module/story/control.php index fece02029e..3d21c36071 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1375,10 +1375,10 @@ class story extends control * @access public * @return void */ - public function track($productID, $branch = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function track($productID, $branch = 0, $projectID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1) { /* Set menu. The projectstory module does not execute. */ - if($this->app->rawModule == 'story') + if(!$projectID) { $products = $this->product->getPairs(); $productID = $this->product->saveState($productID, $products); @@ -1398,7 +1398,11 @@ class story extends control $pager = new pager($recTotal, $recPerPage, $pageID); $tracks = $this->story->getTracks($productID, $branch, $pager); - if($this->app->rawModule == 'projectstory') $projectProducts = $this->product->getProducts($this->session->project); + if($projectID) + { + $this->loadModel('project')->setMenu($projectID); + $projectProducts = $this->product->getProducts($projectID); + } $this->view->title = $this->lang->story->track; $this->view->position[] = $this->lang->story->track;