From 3f0f54073d98f4f5382412424943b0f05e14cc7f Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Mon, 6 Jun 2022 10:46:00 +0800 Subject: [PATCH 1/2] * Fix bug #23267. --- extension/lite/common/ext/lang/zh-cn/lite.php | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index 95d53abccc..edf2a0267d 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -75,24 +75,24 @@ $lang->my->dividerMenu = ',calendar,'; $lang->project->target = '目标'; /* Scrum menu. */ -$lang->kanban->menu = new stdclass(); -$lang->kanban->menu->index = array('link' => "{$lang->dashboard}|project|index|project=%s"); -$lang->kanban->menu->execution = array('link' => "$lang->executionKanban|project|execution|status=all&projectID=%s", 'subModule' => 'execution,task'); -$lang->kanban->menu->story = array('link' => "{$lang->project->target}|projectstory|story|projectID=%s", 'subModule' => 'projectstory,tree,story', 'alias' => 'story,track'); -$lang->kanban->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=project&objectID=%s", 'subModule' => 'doc'); -$lang->kanban->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic|project=%s"); -$lang->kanban->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team'); +$lang->kanbanProject->menu = new stdclass(); +$lang->kanbanProject->menu->index = array('link' => "{$lang->dashboard}|project|index|project=%s"); +$lang->kanbanProject->menu->execution = array('link' => "$lang->executionKanban|project|execution|status=all&projectID=%s", 'subModule' => 'execution,task'); +$lang->kanbanProject->menu->story = array('link' => "{$lang->project->target}|projectstory|story|projectID=%s", 'subModule' => 'projectstory,tree,story', 'alias' => 'story,track'); +$lang->kanbanProject->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=project&objectID=%s", 'subModule' => 'doc'); +$lang->kanbanProject->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic|project=%s"); +$lang->kanbanProject->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team'); -$lang->kanban->dividerMenu = ',execution,settings,'; +$lang->kanbanProject->dividerMenu = ',execution,settings,'; /* Scrum menu order. */ -$lang->kanban->menuOrder = array(); -$lang->kanban->menuOrder[5] = 'index'; -$lang->kanban->menuOrder[10] = 'execution'; -$lang->kanban->menuOrder[15] = 'story'; -$lang->kanban->menuOrder[20] = 'doc'; -$lang->kanban->menuOrder[25] = 'dynamic'; -$lang->kanban->menuOrder[30] = 'settings'; +$lang->kanbanProject->menuOrder = array(); +$lang->kanbanProject->menuOrder[5] = 'index'; +$lang->kanbanProject->menuOrder[10] = 'execution'; +$lang->kanbanProject->menuOrder[15] = 'story'; +$lang->kanbanProject->menuOrder[20] = 'doc'; +$lang->kanbanProject->menuOrder[25] = 'dynamic'; +$lang->kanbanProject->menuOrder[30] = 'settings'; $lang->execution->menu = new stdclass(); $lang->execution->menu->kanban = array('link' => "看板视图|execution|kanban|executionID=%s"); @@ -102,12 +102,12 @@ if($config->edition != 'open') $lang->execution->menu->gantt = array('link' = $lang->execution->menu->tree = array('link' => "树状图|execution|tree|executionID=%s"); $lang->execution->menu->grouptask = array('link' => "分组视图|execution|grouptask|executionID=%s"); -$lang->kanban->menu->doc['subMenu'] = new stdclass(); +$lang->kanbanProject->menu->doc['subMenu'] = new stdclass(); -$lang->kanban->menu->settings['subMenu'] = new stdclass(); -$lang->kanban->menu->settings['subMenu']->view = array('link' => "$lang->overview|project|view|project=%s", 'alias' => 'edit'); -$lang->kanban->menu->settings['subMenu']->members = array('link' => "{$lang->team->common}|project|team|project=%s", 'alias' => 'managemembers,team'); -$lang->kanban->menu->settings['subMenu']->whitelist = array('link' => "{$lang->whitelist}|project|whitelist|project=%s", 'subModule' => 'personnel'); +$lang->kanbanProject->menu->settings['subMenu'] = new stdclass(); +$lang->kanbanProject->menu->settings['subMenu']->view = array('link' => "$lang->overview|project|view|project=%s", 'alias' => 'edit'); +$lang->kanbanProject->menu->settings['subMenu']->members = array('link' => "{$lang->team->common}|project|team|project=%s", 'alias' => 'managemembers,team'); +$lang->kanbanProject->menu->settings['subMenu']->whitelist = array('link' => "{$lang->whitelist}|project|whitelist|project=%s", 'subModule' => 'personnel'); unset($lang->doc->menu->product); unset($lang->doc->menu->api); From 0e24f99f82752f2a8925fd4dfc7260513e5d482c Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Tue, 7 Jun 2022 12:10:33 +0800 Subject: [PATCH 2/2] * Fix bug for lite. --- extension/lite/execution/ext/control/kanban.php | 2 +- extension/lite/execution/ext/model/lite.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extension/lite/execution/ext/control/kanban.php b/extension/lite/execution/ext/control/kanban.php index 2ae31c2ffd..00b60ac14f 100644 --- a/extension/lite/execution/ext/control/kanban.php +++ b/extension/lite/execution/ext/control/kanban.php @@ -10,7 +10,7 @@ class myExecution extends execution $currentMethod = $this->app->methodName; $execution = $this->execution->getById($executionID); $this->loadModel('project')->setMenu($execution->project); - $this->lang->kanban->menu->execution['subMenu'] = new stdClass(); + $this->lang->kanbanProject->menu->execution['subMenu'] = new stdClass(); $this->session->set('kanbanview', $currentMethod); setcookie('kanbanview', $currentMethod, $this->config->cookieLife, $this->config->webRoot, '', false, true); diff --git a/extension/lite/execution/ext/model/lite.php b/extension/lite/execution/ext/model/lite.php index c30cfcba32..c74aeb05a9 100644 --- a/extension/lite/execution/ext/model/lite.php +++ b/extension/lite/execution/ext/model/lite.php @@ -7,8 +7,8 @@ public function setMenu($executionID, $buildID = 0, $extra = '') if(isset($this->lang->execution->menu->kanban)) { $this->loadModel('project')->setMenu($execution->project); - $this->lang->kanban->menu->execution['subMenu'] = new stdClass(); - if($this->app->rawModule == 'tree') unset($this->lang->kanban->menu->execution['subMenu']); + $this->lang->kanbanProject->menu->execution['subMenu'] = new stdClass(); + if($this->app->rawModule == 'tree') unset($this->lang->kanbanProject->menu->execution['subMenu']); } $kanbanList = $this->getList($execution->project, 'kanban', 'all'); @@ -140,7 +140,7 @@ public function getTRActions($currentMethod) unset($subMenu->$key); } } - + $TRActions = ''; $TRActions .= "
"; $TRActions .= html::a("javascript:;", " " . $subMenu->{$currentMethod}['name'] . " ", '', "class='btn btn-link' data-toggle='dropdown'");