diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index 72343eb1b5..df9774e871 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -96,9 +96,9 @@ $lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$l if($config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList')); $lang->admin->menuList->feature['tabMenu']['product']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'), 'alias' => 'browsestoryconcept'); -$lang->admin->menuList->feature['tabMenu']['product']['story'] = array('link' => "{$lang->productCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=categoryList")); -$lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('link' => "{$lang->productCommon}|custom|required|module=productplan"); -$lang->admin->menuList->feature['tabMenu']['product']['release'] = array('link' => "{$lang->productCommon}|custom|required|module=release"); +$lang->admin->menuList->feature['tabMenu']['product']['story'] = array('link' => "{$lang->SRCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=categoryList")); +$lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('link' => "{$lang->productplan->shortCommon}|custom|required|module=productplan"); +$lang->admin->menuList->feature['tabMenu']['product']['release'] = array('link' => "{$lang->release->common}|custom|required|module=release"); $lang->admin->menuList->feature['menuOrder']['5'] = 'my'; $lang->admin->menuList->feature['menuOrder']['10'] = 'product'; diff --git a/module/admin/model.php b/module/admin/model.php index 5993053e55..df2fed669b 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -274,15 +274,22 @@ class adminModel extends model $moduleName = $this->app->rawModule; $methodName = $this->app->rawMethod; $paramName = $this->app->rawParams ? reset($this->app->rawParams) : ''; - if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false) + foreach($this->lang->admin->menuList->$menuKey['subMenu'] as $subMenuKey => $subMenu) { - if(strpos(',todo,block,', $paramName) !== false) $subMenuKey = 'my'; - if(strpos(',product,story,productplan,release,', $paramName) !== false) $subMenuKey = 'product'; - if($this->config->vision == 'lite' and $paramName == 'task') $subMenuKey = 'my'; - if(isset($subMenuKey)) $this->lang->admin->menuList->$menuKey['subMenu'][$subMenuKey]['subModule'] = $moduleName; + $subModule = ''; + if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false) + { + if(strpos(',todo,block,', $paramName) !== false and $subMenuKey == 'my') $subModule = 'custom'; + if(strpos(',product,story,productplan,release,', $paramName) !== false and $subMenuKey == 'product') $subModule = 'custom'; + if($this->config->vision == 'lite' and $paramName == 'task' and $subMenuKey == 'my') $subModule = 'custom'; + } + + if(!empty($subModule)) $subMenu['subModule'] = $subModule; + if(isset($this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey])) $subMenu['subMenu'] = $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey]; + + $this->lang->admin->menu->$subMenuKey = $subMenu; } - $this->lang->admin->menu = $this->lang->admin->menuList->$menuKey['subMenu']; } if(isset($this->lang->admin->menuList->$menuKey['menuOrder'])) $this->lang->admin->menuOrder = $this->lang->admin->menuList->$menuKey['menuOrder']; @@ -317,8 +324,16 @@ class adminModel extends model /* Check tab menu priv. */ foreach($menu['tabMenu'][$subMenuKey] as $tabMenuKey => $tabMenu) { - $link = $this->getHasPrivLink($tabMenu); - if(!empty($link)) break; + $tabMenuLink = $this->getHasPrivLink($tabMenu); + if(!empty($tabMenuLink)) + { + /* Updated tertiary navigation links. */ + list($module, $method, $params) = $tabMenuLink; + $tabMenuLabel = $tabMenu['link']; + $menu['tabMenu'][$subMenuKey][$tabMenuKey]['link'] = substr($tabMenuLabel, 0, strpos($tabMenuLabel, '|') + 1) . $module . '|' . $method . '|' . $params; + + if(empty($link)) $link = $tabMenuLink; + } } } else @@ -330,7 +345,7 @@ class adminModel extends model { /* Updated secondary navigation link. */ list($module, $method, $params) = $link; - $subMenuLabel = $menu['subMenu'][$subMenuKey]['link']; + $subMenuLabel = $subMenu['link']; $menu['subMenu'][$subMenuKey]['link'] = substr($subMenuLabel, 0, strpos($subMenuLabel, '|') + 1) . $module . '|' . $method . '|' . $params; /* Update the level 1 navigation link. */ diff --git a/module/admin/view/tabmenu.html.php b/module/admin/view/tabmenu.html.php deleted file mode 100755 index 646627e52b..0000000000 --- a/module/admin/view/tabmenu.html.php +++ /dev/null @@ -1,30 +0,0 @@ - diff --git a/module/custom/view/browsestoryconcept.html.php b/module/custom/view/browsestoryconcept.html.php index 2871d1053e..ba845b8e31 100644 --- a/module/custom/view/browsestoryconcept.html.php +++ b/module/custom/view/browsestoryconcept.html.php @@ -9,7 +9,7 @@ * @version $Id: browsestoryconcept.html.php 4129 2020-09-01 01:58:14Z sgm $ */ ?> - +getModuleRoot() . 'common/view/header.html.php';?>
diff --git a/module/custom/view/execution.html.php b/module/custom/view/execution.html.php index 2d42966221..927dbf38ca 100644 --- a/module/custom/view/execution.html.php +++ b/module/custom/view/execution.html.php @@ -9,7 +9,7 @@ * @link http://www.zentao.net */ ?> - +getModuleRoot() . 'common/view/header.html.php';?>
diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php index 9c460ba9ed..fb4e630adb 100644 --- a/module/custom/view/flow.html.php +++ b/module/custom/view/flow.html.php @@ -9,7 +9,7 @@ * @version $Id: deny.html.php 4129 2013-01-18 01:58:14Z wwccss $ */ ?> - +getModuleRoot() . 'common/view/header.html.php';?> config->conceptSetted)):?>
diff --git a/module/custom/view/header.html.php b/module/custom/view/header.html.php index 2e7a501bac..e69de29bb2 100644 --- a/module/custom/view/header.html.php +++ b/module/custom/view/header.html.php @@ -1,2 +0,0 @@ -getModuleRoot() . 'common/view/header.html.php';?> -getModuleRoot() . 'admin/view/tabmenu.html.php';?> diff --git a/module/custom/view/kanban.html.php b/module/custom/view/kanban.html.php index a1a6446a49..6ec93027fb 100644 --- a/module/custom/view/kanban.html.php +++ b/module/custom/view/kanban.html.php @@ -9,7 +9,7 @@ * @link http://www.zentao.net */ ?> - +getModuleRoot() . 'common/view/header.html.php';?>
diff --git a/module/custom/view/product.html.php b/module/custom/view/product.html.php index 0546283245..f5137a9a81 100644 --- a/module/custom/view/product.html.php +++ b/module/custom/view/product.html.php @@ -9,7 +9,7 @@ * @link http://www.zentao.net */ ?> - +getModuleRoot() . 'common/view/header.html.php';?>
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php index 47e69cdca3..37458bdcbc 100644 --- a/module/custom/view/required.html.php +++ b/module/custom/view/required.html.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ ?> - +getModuleRoot() . 'common/view/header.html.php';?>
diff --git a/module/custom/view/score.html.php b/module/custom/view/score.html.php index 5f44354bf4..cba80c6bde 100644 --- a/module/custom/view/score.html.php +++ b/module/custom/view/score.html.php @@ -9,7 +9,7 @@ * @link http://www.zentao.net */ ?> - +getModuleRoot() . 'common/view/header.html.php';?>
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index cfbf74c024..00b1c1af16 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ ?> - +getModuleRoot() . 'common/view/header.html.php';?> diff --git a/module/custom/view/working.html.php b/module/custom/view/working.html.php deleted file mode 100644 index 888e38736f..0000000000 --- a/module/custom/view/working.html.php +++ /dev/null @@ -1,35 +0,0 @@ - - * @package custom - * @version $Id$ - * @link http://www.zentao.net - */ -?> - -
- -
-
- custom->working?> -
-
-
- - - - - -
custom->working;?> - global->flow) ? $config->global->flow : 'full';?> - custom->workingList as $key => $value):?> -

- -
-
-
- diff --git a/module/release/lang/de.php b/module/release/lang/de.php index 0772adf5d3..09358c1a92 100644 --- a/module/release/lang/de.php +++ b/module/release/lang/de.php @@ -9,7 +9,6 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = 'Product Release'; $lang->release->create = "Erstellen"; $lang->release->edit = "Bearbeiten"; $lang->release->linkStory = "Story verknüpfen"; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index ecdcfab2b6..b4a259010d 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -9,7 +9,6 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = 'Product Release'; $lang->release->create = "Create Release"; $lang->release->edit = "Edit Release"; $lang->release->linkStory = "Link Story"; diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php index e4b46198d1..e012187606 100644 --- a/module/release/lang/fr.php +++ b/module/release/lang/fr.php @@ -9,7 +9,6 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = 'Product Release'; $lang->release->create = "Créer Release"; $lang->release->edit = "Editer Release"; $lang->release->linkStory = "Intégrer Story"; diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php index 9f3af90ca8..43854f3bc6 100644 --- a/module/release/lang/zh-cn.php +++ b/module/release/lang/zh-cn.php @@ -9,7 +9,6 @@ * @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->release->common = '产品发布'; $lang->release->create = "创建发布"; $lang->release->edit = "编辑发布"; $lang->release->linkStory = "关联{$lang->SRCommon}";