diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 2e2107aefa..1cdbc98c1e 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -225,8 +225,9 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang-> /* Execution menu. */ $lang->execution->homeMenu = new stdclass(); -if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|"; -$lang->execution->homeMenu->list = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit'); +//if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|"; +//$lang->execution->homeMenu->list = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit'); +$lang->execution->homeMenu->executionkanban = array('link' => "{$lang->execution->executionKanban}|execution|executionkanban|"); $lang->execution->menu = new stdclass(); $lang->execution->menu->task = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 911531ff6a..c6d539fc1f 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -209,7 +209,7 @@ $lang->my->work = '待处理'; $lang->project->list = '项目列表'; -$lang->execution->list = "{$lang->executionCommon}列表"; +$lang->execution->executionKanban = "{$lang->execution->common}看板"; $lang->doc->recent = '最近文档'; $lang->doc->my = '我的文档'; diff --git a/module/common/model.php b/module/common/model.php index 812c1007cd..f7890da9ca 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -543,7 +543,7 @@ class commonModel extends model { $nav = $lang->mainNav->$openApp; list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav); - if($openApp == 'execution') $currentMethod = 'all'; + if($openApp == 'execution') $currentMethod = 'executionKanban'; } else { @@ -553,7 +553,7 @@ class commonModel extends model } if($config->systemMode == 'classic' and $openApp == 'execution') $icon = zget($lang->navIcons, 'project', ''); - $link = ($openApp != 'execution' or ($config->systemMode == 'classic')) ? helper::createLink($currentModule, $currentMethod) : ''; + $link = helper::createLink($currentModule, $currentMethod); $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}"; echo "