diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 1a91bd7e5a..21acdf9cd5 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -228,11 +228,11 @@ $lang->release->menu = $lang->product->menu; $lang->project = new stdclass(); $lang->project->menu = new stdclass(); -$lang->project->menu->list = array('link' => '%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,importbug,tree'); +$lang->project->menu->list = array('link' => '%s', 'subModule' => 'task,grouptask,tree', 'alias' => 'grouptask,importtask,importbug,tree'); $lang->project->menu->kanban = array('link' => 'Kanban|project|kanban|projectID=%s'); $lang->project->menu->burn = array('link' => 'Burn|project|burn|projectID=%s'); $lang->project->menu->story = array('link' => 'Story|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->project->menu->qa = array('link' => '%s', 'subModule' => 'build'); +$lang->project->menu->qa = array('link' => '%s', 'subModule' => 'bug,build,testtask'); $lang->project->menu->doc = array('link' => 'Doc|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); $lang->project->menu->action = array('link' => '%s'); $lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 99edf9486c..75142db070 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -228,11 +228,11 @@ $lang->release->menu = $lang->product->menu; $lang->project = new stdclass(); $lang->project->menu = new stdclass(); -$lang->project->menu->list = array('link' => '%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,importbug,tree'); +$lang->project->menu->list = array('link' => '%s', 'subModule' => 'task,grouptask,tree', 'alias' => 'grouptask,importtask,importbug,tree'); $lang->project->menu->kanban = array('link' => '看板|project|kanban|projectID=%s'); $lang->project->menu->burn = array('link' => '燃尽图|project|burn|projectID=%s'); $lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->project->menu->qa = array('link' => '%s', 'subModule' => 'build'); +$lang->project->menu->qa = array('link' => '%s', 'subModule' => 'bug,build,testtask'); $lang->project->menu->doc = array('link' => '文档|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); $lang->project->menu->action = array('link' => '%s'); $lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 278ef86663..61b3276fdb 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -228,11 +228,11 @@ $lang->release->menu = $lang->product->menu; $lang->project = new stdclass(); $lang->project->menu = new stdclass(); -$lang->project->menu->list = array('link' => '%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,importbug,tree'); +$lang->project->menu->list = array('link' => '%s', 'subModule' => 'task,grouptask,tree', 'alias' => 'grouptask,importtask,importbug,tree'); $lang->project->menu->kanban = array('link' => '看板|project|kanban|projectID=%s'); $lang->project->menu->burn = array('link' => '燃盡圖|project|burn|projectID=%s'); $lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->project->menu->qa = array('link' => '%s', 'subModule' => 'build'); +$lang->project->menu->qa = array('link' => '%s', 'subModule' => 'bug,build,testtask'); $lang->project->menu->doc = array('link' => '文檔|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); $lang->project->menu->action = array('link' => '%s'); $lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; diff --git a/module/custom/control.php b/module/custom/control.php index 23f2e09044..1d7eaa288b 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -407,6 +407,7 @@ class custom extends control */ public function ajaxGetMenu($module = 'main', $method = '', $type = '') { + $this->loadModel('project')->setMenu(array(), 0); if($type === 'all') { $menu = array(); diff --git a/module/custom/js/ajaxmenu.js b/module/custom/js/ajaxmenu.js index 085845702d..dbb9ccef81 100644 --- a/module/custom/js/ajaxmenu.js +++ b/module/custom/js/ajaxmenu.js @@ -2,9 +2,9 @@ $(function() { var currentModule = startMenu['module'], currentMethod = startMenu['method'], - $navbar = $('#navbar'), - $subNavbar = $('#subNavbar'), - $mainMenu = $('#mainMenu'), + $navbar = $('#navbar'), + $subNavbar = $('#subNavbar'), + $mainMenu = $('#mainMenu'), $loadingIcon = $('#loadingIcon'), $menuEditor = $('#menuEditor'); var menuConfig = @@ -115,8 +115,8 @@ $(function() $menuEditor.on('mouseenter', '.nav > li:not(.drag-shadow) > a', function() { - var $a = $(this); - var item = $a.data('menu'); + var $a = $(this); + var item = $a.data('menu'); var $menu = $a.closest('nav'); if($menu.is('#navbar')) diff --git a/module/custom/view/ajaxmenu.html.php b/module/custom/view/ajaxmenu.html.php index acf07fdcf3..a5cb92cae6 100644 --- a/module/custom/view/ajaxmenu.html.php +++ b/module/custom/view/ajaxmenu.html.php @@ -15,7 +15,7 @@

- customMenu ?> + customMenu;?>