-
+
diff --git a/module/doc/control.php b/module/doc/control.php
index 78abec6574..89526a960e 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -921,18 +921,10 @@ class doc extends control
$table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
$object = $this->dao->select('id,name,status')->from($table)->where('id')->eq($objectID)->fetch();
if(empty($object)) $this->locate($this->createLink($type, 'create', '', '', '', $this->session->PRJ));
+ $this->lang->noMenuModule[] = 'doc';
- if($from == 'product')
- {
- $this->product->setMenu($this->product->getPairs(), $objectID);
- $this->lang->product->switcherMenu = $this->product->getSwitcher($objectID);
- $this->lang->noMenuModule[] = 'doc';
- }
- elseif($from == 'project' or $from == 'execution')
- {
- if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
- }
- else
+ $from = $this->app->openApp;
+ if($from == 'doc')
{
$crumb = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->executionCommon) . $this->lang->doc->separator;
if($this->productID and $type == 'execution') $crumb = $this->doc->getProductCrumb($this->productID, $objectID);
@@ -940,6 +932,12 @@ class doc extends control
$productID = $type == 'product' ? $objectID : 0;
$executionID = $type == 'execution' ? $objectID : 0;
$this->doc->setMenu($type, 0, 0, $productID, $executionID, $crumb);
+
+ }
+ else
+ {
+ $this->lang->noMenuModule[] = 'doc';
+ $this->loadModel($from)->setMenu($objectID);
}
/* Set Custom. */
diff --git a/module/execution/control.php b/module/execution/control.php
index 6480b21ddd..d43091bab6 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1184,8 +1184,8 @@ class execution extends control
{
$project = $this->project->getByID($projectID);
$model = $project->model;
- $this->lang->project->menu = $this->lang->menu->$model;
- commonModel::setAppobjectID('project', $projectID);
+
+ $this->project->setMenu($projectID);
}
$this->app->loadLang('program');
@@ -2682,7 +2682,7 @@ class execution extends control
$from = $this->app->openApp;
if($from == 'execution') $this->session->set('executionList', $this->app->getURI(true), 'execution');
- if($from == 'project') $this->lang->navGroup->execution = 'project';
+ if($from == 'project') $this->project->setMenu($projectID);
/* Load pager and get tasks. */
$this->app->loadClass('pager', $static = true);
diff --git a/module/execution/model.php b/module/execution/model.php
index 10d87527dc..7ce583bb40 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -58,29 +58,18 @@ class executionModel extends model
* @param int $buildID
* @param string $extra
* @access public
- * @return bool
+ * @return void
*/
public function setMenu($executions, $executionID, $buildID = 0, $extra = '')
{
- if(empty($executions))
- {
- $project = $this->loadModel('project')->getByID($this->session->PRJ);
- if($project->model == 'waterfall')
- {
- if(($this->app->moduleName == 'programplan' && $this->app->methodName != 'create') || $this->app->moduleName == 'execution') die(js::locate(helper::createLink('programplan', 'create', "projectID=$project->id")));
- }
- else
- {
- if($this->app->moduleName == 'execution' && $this->app->methodName != 'create') die(js::locate(helper::createLink('execution', 'create')));
- }
- }
-
if(!$executionID and $this->session->execution) $executionID = $this->session->execution;
if(!$executionID or !in_array($executionID, array_keys($executions))) $executionID = key($executions);
$this->session->set('execution', $executionID);
/* Unset story, bug, build and testtask if type is ops. */
$execution = $this->getByID($executionID);
+
+ /*
if($execution and $execution->lifetime == 'ops')
{
unset($this->lang->execution->menu->story);
@@ -89,13 +78,16 @@ class executionModel extends model
unset($this->lang->execution->subMenu->qa->build);
unset($this->lang->execution->subMenu->qa->testtask);
}
+ */
/* Hide story and qa menu when execution is story or design type. */
+ /*
if($execution and ($execution->attribute == 'story' or $execution->attribute == 'design'))
{
unset($this->lang->execution->menu->story);
unset($this->lang->execution->menu->qa);
}
+ */
if($executions and (!isset($executions[$executionID]) or !$this->checkPriv($executionID))) $this->accessDenied();
@@ -108,43 +100,8 @@ class executionModel extends model
$this->cookie->executionMode = 'all';
}
- /* Set execution module page nav. */
- $label = $this->lang->execution->index;
- if($methodName == 'all') $label = $this->lang->execution->allExecutions;
- if($methodName == 'create' and $moduleName == 'execution') $label = $this->lang->execution->create;
-
- foreach($this->lang->execution->menu as $key => $menu) common::setMenuVars($this->lang->execution->menu, $key, $executionID);
- foreach($this->lang->execution->qaMenu as $key => $menu) common::setMenuVars($this->lang->execution->qaMenu, $key, $executionID);
-
- foreach($this->lang->execution->menu as $key => $menu)
- {
- common::setMenuVars($this->lang->execution->menu, $key, $executionID);
-
- if(isset($this->lang->execution->subMenu->$key))
- {
- $executionSubMenu = $this->lang->execution->subMenu->$key;
- $subMenu = common::createSubMenu($this->lang->execution->subMenu->$key, $executionID);
-
- if(!empty($subMenu))
- {
- foreach($subMenu as $menuKey => $menu)
- {
- $itemMenu = zget($executionSubMenu, $menuKey, '');
- $isActive['method'] = ($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method']));
- $isActive['alias'] = ($moduleName == strtolower($menu->link['module']) and (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false));
- $isActive['subModule'] = (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false);
- if($isActive['method'] or $isActive['alias'] or $isActive['subModule'])
- {
- $this->lang->execution->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
- break;
- }
- }
- $this->lang->execution->menu->{$key}['subMenu'] = $subMenu;
- }
- }
- }
-
- return true;
+ $this->lang->switcherMenu = $this->getSwitcher($executionID, $this->app->rawModule, $this->app->rawMethod);
+ common::setMenuVars('execution', $executionID);
}
/**
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 4ea5d31807..feb21535b2 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -139,23 +139,6 @@ $lang->resource->todo->activate = 'activate';
$lang->resource->todo->close = 'close';
$lang->resource->todo->batchClose = 'batchClose';
-$lang->todo->methodOrder[5] = 'create';
-$lang->todo->methodOrder[10] = 'createCycle';
-$lang->todo->methodOrder[15] = 'batchCreate';
-$lang->todo->methodOrder[20] = 'edit';
-$lang->todo->methodOrder[25] = 'batchEdit';
-$lang->todo->methodOrder[30] = 'view';
-$lang->todo->methodOrder[35] = 'delete';
-$lang->todo->methodOrder[40] = 'export';
-$lang->todo->methodOrder[45] = 'start';
-$lang->todo->methodOrder[50] = 'finish';
-$lang->todo->methodOrder[55] = 'batchFinish';
-$lang->todo->methodOrder[60] = 'import2Today';
-$lang->todo->methodOrder[65] = 'assignTo';
-$lang->todo->methodOrder[70] = 'activate';
-$lang->todo->methodOrder[75] = 'close';
-$lang->todo->methodOrder[80] = 'batchClose';
-
global $config;
if($config->systemMode == 'new')
{
diff --git a/module/message/view/header.html.php b/module/message/view/header.html.php
index eab41ff405..c101596db7 100644
--- a/module/message/view/header.html.php
+++ b/module/message/view/header.html.php
@@ -1,4 +1,4 @@
-
+
diff --git a/module/personnel/control.php b/module/personnel/control.php
index efa1c286f7..e87e676011 100644
--- a/module/personnel/control.php
+++ b/module/personnel/control.php
@@ -26,10 +26,10 @@ class personnel extends control
*/
public function accessible($programID = 0, $deptID = 0, $browseType='browse', $param = 0, $recTotal = 0, $recPerPage = 15, $pageID = 1)
{
- $this->setProgramMenu($programID);
+ $this->loadModel('program')->setMenu($programID);
$this->app->loadLang('user');
- $program = $this->loadModel('program')->getByID($programID);
+ $program = $this->program->getByID($programID);
/* Set the pager. */
$this->app->loadClass('pager', true);
@@ -72,8 +72,7 @@ class personnel extends control
*/
public function invest($programID = 0)
{
- $this->setProgramMenu($programID);
- commonModel::setAppObjectID('program', $programID);
+ $this->loadModel('program')->setMenu($programID);
$this->view->title = $this->lang->personnel->invest;
$this->view->position[] = $this->lang->personnel->invest;
@@ -99,7 +98,14 @@ class personnel extends control
*/
public function whitelist($objectID = 0, $module = 'personnel', $objectType = 'program', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $programID = 0, $from = '')
{
- if($module == 'personnel') $this->setProgramMenu($objectID);
+ if($this->app->openApp == 'program')
+ {
+ $this->loadModel('program')->setMenu($objectID);
+ }
+ else if($this->app->openApp == 'project')
+ {
+ $this->loadModel('project')->setMenu($objectID);
+ }
if($module == 'product')
{
@@ -149,7 +155,15 @@ class personnel extends control
*/
public function addWhitelist($objectID = 0, $deptID = 0, $objectType = 'program', $module = 'personnel', $programID = 0, $from = '')
{
- if($module == 'personnel') $this->setProgramMenu($objectID);
+ if($this->app->openApp == 'program')
+ {
+ $this->loadModel('program')->setMenu($objectID);
+ }
+ else if($this->app->openApp == 'project')
+ {
+ $this->loadModel('project')->setMenu($objectID);
+ }
+
$this->app->loadLang('execution');
if($_POST)
@@ -214,18 +228,4 @@ class personnel extends control
die(js::reload('parent'));
}
}
-
- /*
- * Setting up the program menu.
- *
- * @param int $programID
- * @access public
- * @return void
- */
- public function setProgramMenu($programID = 0)
- {
- $this->loadModel('program');
- $this->lang->program->switcherMenu = $this->program->getSwitcher($programID);
- commonModel::setAppObjectID('program', $programID);
- }
}
diff --git a/module/product/control.php b/module/product/control.php
index df19069b23..003fa33b4c 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -56,7 +56,7 @@ class product extends control
if($this->app->getViewType() != 'mhtml') unset($this->lang->product->menu->index);
$productID = $this->product->saveState($productID, $this->products);
$branch = (int)$this->cookie->preBranch;
- //$this->product->setMenu($this->products, $productID, $branch);
+ //$this->product->setMenu($productID, $branch);
if(common::hasPriv('product', 'create')) $this->lang->TRActions = html::a($this->createLink('product', 'create'), " " . $this->lang->product->create, '', "class='btn btn-primary'");
@@ -77,8 +77,7 @@ class product extends control
*/
public function project($status = 'all', $productID = 0, $branch = 0, $involved = 0)
{
- $this->product->setMenu($this->products, $productID, $branch);
- $this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
+ $this->product->setMenu($productID, $branch);
$this->app->loadLang('my');
$this->app->loadLang('execution');
@@ -122,6 +121,8 @@ class product extends control
*/
public function browse($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1, $from = 'product')
{
+ $this->product->setMenu($productID, $branch);
+
/* Lower browse type. */
$browseType = strtolower($browseType);
@@ -161,7 +162,6 @@ class product extends control
$this->session->set('productList', $this->app->getURI(true));
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID, "storyType=$storyType", $branch);
- $this->product->setMenu($this->products, $productID, $branch);
}
/* Set moduleTree. */
@@ -321,8 +321,6 @@ class product extends control
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
}
- if($programID) commonModel::setAppObjectID('program', $programID);
-
$this->loadModel('user');
$poUsers = $this->user->getPairs('nodeleted|pofirst|noclosed', '', $this->config->maxCount);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink;
@@ -361,9 +359,7 @@ class product extends control
*/
public function edit($productID, $action = 'edit', $extra = '', $programID = 0)
{
- /* Set menu. */
$this->app->loadLang('custom');
- $this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
/* Init vars. */
$product = $this->product->getById($productID);
@@ -451,7 +447,7 @@ class product extends control
}
$productID = $this->product->saveState($productID, $this->products);
- $this->product->setMenu($this->products, $productID);
+ $this->product->setMenu($productID);
$moduleIndex = array_search('product', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
@@ -598,7 +594,7 @@ class product extends control
die(js::reload('parent.parent'));
}
- $this->product->setMenu($this->products, $productID);
+ $this->product->setMenu($productID);
$this->view->product = $product;
$this->view->title = $this->view->product->name . $this->lang->colon .$this->lang->close;
@@ -622,10 +618,9 @@ class product extends control
$moduleIndex = array_search('product', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
- $this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
$product->desc = $this->loadModel('file')->setImgSize($product->desc);
- $this->product->setMenu($this->products, $productID);
+ $this->product->setMenu($productID);
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -680,7 +675,7 @@ class product extends control
public function roadmap($productID, $branch = 0)
{
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
- $this->product->setMenu($this->products, $productID, $branch);
+ $this->product->setMenu($productID, $branch);
$this->session->set('releaseList', $this->app->getURI(true));
$this->session->set('productPlanList', $this->app->getURI(true));
@@ -725,7 +720,7 @@ class product extends control
$this->session->set('caseList', $uri);
$this->session->set('testtaskList', $uri);
- $this->product->setMenu($this->products, $productID);
+ $this->product->setMenu($productID);
/* Append id for secend sort. */
$orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
@@ -782,10 +777,8 @@ class product extends control
$product = $this->product->getStatByID($productID);
if(!$product) die(js::locate('product', 'all'));
- $this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
-
$product->desc = $this->loadModel('file')->setImgSize($product->desc);
- $this->product->setMenu($this->products, $productID);
+ $this->product->setMenu($productID);
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -1101,7 +1094,7 @@ class product extends control
public function whitelist($productID = 0, $module = 'product', $objectType = 'product', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID, '', 0);
- $this->product->setMenu($this->products, $productID, 0);
+ $this->product->setMenu($productID, 0);
$this->lang->modulePageNav = '';
echo $this->fetch('personnel', 'whitelist', "objectID=$productID&module=product&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
@@ -1118,8 +1111,7 @@ class product extends control
*/
public function addWhitelist($productID = 0, $deptID = 0, $branch = '')
{
- $this->lang->product->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
- $this->product->setMenu($this->products, $productID, $branch);
+ $this->product->setMenu($productID, $branch);
$moduleIndex = array_search('product', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
$this->lang->modulePageNav = '';
@@ -1223,7 +1215,7 @@ class product extends control
/* Get current product. */
$productID = $this->product->saveState($productID, $this->products);
$product = $this->product->getById($productID);
- $this->product->setMenu($this->products, $productID, $branch);
+ $this->product->setMenu($productID, $branch);
/* Set menu.*/
$this->session->set('buildList', $this->app->getURI(true));
diff --git a/module/product/model.php b/module/product/model.php
index 0e8be554c1..ac36c79dad 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -13,37 +13,6 @@
getByID($productID);
- if($product)
- {
- $this->getModuleNav($products, '', $product, $extra, $branch, $module, $moduleType);
- }
-
- foreach($this->lang->product->menu as $key => $menu)
- {
- $replace = array();
- $replace['productID'] = $productID;
- $replace['branch'] = $branch;
- common::setMenuVars($this->lang->product->menu, $key, $replace);
- }
- }
-
/**
* Get product module menu.
*
@@ -1694,4 +1663,27 @@ class productModel extends model
}
}
}
+
+ /**
+ *
+ * Set menu.
+ *
+ * @param int $productID
+ * @param int $branch
+ * @param int $module
+ * @param string $moduleType
+ * @param string $extra
+ *
+ * @access public
+ * @return void
+ */
+ public function setMenu($productID, $branch = 0, $module = 0, $moduleType = '', $extra = '')
+ {
+ $product = $this->getByID($productID);
+ if(!$product) return;
+
+ $this->lang->switcherMenu = $this->getSwitcher($productID, $extra, $branch);
+ $params = array('branch' => $branch);
+ common::setMenuVars('product', $productID, $params);
+ }
}
diff --git a/module/productplan/control.php b/module/productplan/control.php
index f8ea7be8e1..35bafa162e 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -22,9 +22,8 @@ class productplan extends control
*/
public function commonAction($productID, $branch = 0)
{
- $this->lang->product->switcherMenu = $this->loadModel('product')->getSwitcher($productID, '', $branch);
+ $this->loadModel('product')->setMenu($productID, $branch);
- $this->loadModel('product');
$this->app->loadConfig('execution');
$product = $this->product->getById($productID);
if(empty($product)) $this->locate($this->createLink('product', 'create'));
@@ -61,8 +60,6 @@ class productplan extends control
$this->commonAction($productID, $branchID);
$lastPlan = $this->productplan->getLast($productID, $branchID, $parent);
- if($productID) commonModel::setAppObjectID('product', $productID);
-
if($lastPlan)
{
$timestamp = strtotime($lastPlan->end);
diff --git a/module/program/control.php b/module/program/control.php
index 3a6f839ea2..01a907690e 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -98,12 +98,11 @@ class program extends control
$programID = $this->program->saveState($programID, $this->program->getPairs());
setCookie("lastProgram", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+ $this->program->setMenu($programID);
+
$program = $this->program->getByID($programID);
if(empty($program) || $program->type != 'program') die(js::error($this->lang->notFound) . js::locate('back'));
- $this->lang->program->switcherMenu = $this->program->getSwitcher($programID, true);
- commonModel::setAppObjectID('program', $programID);
-
/* Load pager and get tasks. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
@@ -389,15 +388,14 @@ class program extends control
public function project($programID = 0, $browseType = 'all', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
{
$programID = $this->program->saveState($programID, $this->program->getPairs());
- if(!$programID) $this->locate($this->createLink('program', 'browse'));
setCookie("lastProgram", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+ if(!$programID) $this->locate($this->createLink('program', 'browse'));
+
+ $this->program->setMenu($programID);
$this->app->session->set('programProject', $this->app->getURI(true));
$this->app->session->set('projectList', $this->app->getURI(true));
- $this->lang->program->switcherMenu = $this->program->getSwitcher($programID, true);
- commonModel::setAppObjectID('program', $programID);
-
$this->loadModel('datatable');
/* Load pager and get tasks. */
@@ -436,8 +434,7 @@ class program extends control
*/
public function stakeholder($programID = 0, $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
{
- $this->lang->program->switcherMenu = $this->program->getSwitcher($programID, true);
- commonModel::setAppObjectID('program', $programID);
+ $this->program->setMenu($programID);
/* Load pager and get tasks. */
$this->app->loadClass('pager', $static = true);
diff --git a/module/program/model.php b/module/program/model.php
index 4bf6fa82bc..5852453ecf 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -834,4 +834,10 @@ class programModel extends model
return $budgetUnitList;
}
+
+ public function setMenu($programID)
+ {
+ $this->lang->switcherMenu = $this->getSwitcher($programID);
+ common::setMenuVars('program', $programID);
+ }
}
diff --git a/module/project/control.php b/module/project/control.php
index 00b741ffaf..e0b43508db 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -177,6 +177,8 @@ class project extends control
$this->lang->noMenuModule[] = 'project';
$projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram());
+ $this->project->setMenu($projectID);
+
$project = $this->project->getByID($projectID);
if(empty($project) || $project->type != 'project') die(js::error($this->lang->notFound) . js::locate('back'));
@@ -291,11 +293,7 @@ class project extends control
}
}
- if($programID)
- {
- $this->lang->program->switcherMenu = $this->loadModel('program')->getSwitcher($programID, true);
- commonModel::setAppObjectID('program', $programID);
- }
+ if($programID) $this->program->setMenu($programID);
$this->lang->noMenuModule[] = 'project';
@@ -375,9 +373,6 @@ class project extends control
$project = $this->project->getByID($projectID);
$programID = $project->parent;
- /* Navigation stay in program when enter from program list. */
- $this->adjustNavigation($from, $programID);
-
if($_POST)
{
$changes = $this->project->update($projectID);
@@ -456,9 +451,6 @@ class project extends control
{
$this->loadModel('action');
- /* Navigation stay in project when enter from project list. */
- $this->adjustNavigation($from, $projectID);
-
if($this->post->names)
{
$allChanges = $this->project->batchUpdate();
@@ -500,8 +492,8 @@ class project extends control
*/
public function view($projectID = 0)
{
+ $this->project->setMenu($projectID);
$this->app->loadLang('bug');
- $this->lang->project->menu = $this->lang->scrum->setMenu;
$moduleIndex = array_search('project', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
@@ -545,7 +537,8 @@ class project extends control
*/
public function group($projectID = 0, $programID = 0)
{
- $this->lang->project->menu = $this->lang->scrum->setMenu;
+ $this->project->setMenu($projectID);
+
$moduleIndex = array_search('project', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
@@ -604,7 +597,7 @@ class project extends control
*/
public function dynamic($projectID = 0, $type = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
{
- $this->lang->noMenuModule[] = 'project';
+ $this->project->setMenu($projectID);
/* Save session. */
$uri = $this->app->getURI(true);
@@ -683,7 +676,8 @@ class project extends control
{
/* Load module and get project. */
$this->loadModel('build');
- $project = $this->project->getByID($projectID);
+ $project = $this->project->getByID($projectID);
+ $this->project->setMenu($projectID);
$this->session->set('buildList', $this->app->getURI(true));
@@ -854,8 +848,8 @@ class project extends control
*/
public function manageMembers($projectID, $dept = '')
{
- $this->lang->navGroup->project = 'project';
- $this->lang->project->menu = $this->lang->scrum->setMenu;
+ $this->project->setMenu($projectID);
+
$moduleIndex = array_search('project', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
@@ -1196,7 +1190,6 @@ class project extends control
/**
* Get white list personnel.
*
- * @param int $programID
* @param int $projectID
* @param string $module
* @param string $from project|program|programProject
@@ -1208,20 +1201,15 @@ class project extends control
* @access public
* @return void
*/
- public function whitelist($programID = 0, $projectID = 0, $module = 'project', $from = 'project', $objectType = 'project', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+ public function whitelist($projectID = 0, $module = 'project', $from = 'project', $objectType = 'project', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
if($from == 'project')
{
- $this->lang->project->menu = $this->lang->scrum->setMenu;
+ $this->project->setMenu($projectID);
+
$moduleIndex = array_search('project', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
}
- if($from == 'programproject')
- {
- $this->app->rawMethod = 'programproject';
- $this->lang->navGroup->project = 'project';
- $this->lang->project->switcherMenu = $this->loadModel('program')->getSwitcher($programID, true);
- }
echo $this->fetch('personnel', 'whitelist', "objectID=$projectID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID&from=$from");
}
@@ -1238,9 +1226,6 @@ class project extends control
*/
public function addWhitelist($projectID = 0, $deptID = 0, $programID = 0, $from = 'project')
{
- /* Navigation stay in project when enter from project list. */
- $this->adjustNavigation($from, $projectID);
-
echo $this->fetch('personnel', 'addWhitelist', "objectID=$projectID&dept=$deptID&objectType=project&module=project&programID=$programID&from=$from");
}
@@ -1268,8 +1253,7 @@ class project extends control
*/
public function manageProducts($projectID, $programID = 0, $from = 'project')
{
- /* Navigation stay in project when enter from project list. */
- $this->adjustNavigation($from, $projectID);
+ $this->project->setMenu($projectID);
if(!empty($_POST))
{
@@ -1364,26 +1348,4 @@ class project extends control
}
die(json_encode($response));
}
-
- /**
- * Adjust the navigation.
- *
- * @param string $from
- * @param int $objectID projectID|programID
- * @access public
- * @return void
- */
- public function adjustNavigation($from = '', $objectID = 0)
- {
- if($from == 'project')
- {
- $this->lang->project->menu = $this->lang->scrum->setMenu;
- $moduleIndex = array_search('project', $this->lang->noMenuModule);
- if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
- }
- else if($from == 'pgmproject')
- {
- $this->lang->program->switcherMenu = $this->loadModel('program')->getSwitcher($objectID, true);
- }
- }
}
diff --git a/module/project/model.php b/module/project/model.php
index a692316456..ee1ee84ddd 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1584,4 +1584,21 @@ class projectModel extends model
return array_merge($parents, $orphan);
}
+
+ /**
+ * Set menu of project module.
+ *
+ * @param int $objectID projectID
+ * @access public
+ * @return void
+ */
+ 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->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
+ common::setMenuVars('project', $objectID);
+ }
}
diff --git a/module/project/view/group.html.php b/module/project/view/group.html.php
index cc00319457..7a0c169a7b 100644
--- a/module/project/view/group.html.php
+++ b/module/project/view/group.html.php
@@ -15,7 +15,7 @@
group->confirmDelete);?>