From 5ea628d394b69642f320d9d35941883c4d8b7b38 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 13 Jun 2022 09:45:32 +0800 Subject: [PATCH 1/2] * Fix bug #23368. --- module/project/view/index.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php index a7ef0618f7..d527eceb84 100644 --- a/module/project/view/index.html.php +++ b/module/project/view/index.html.php @@ -64,7 +64,7 @@ { $this->app->loadLang('kanban'); echo '
  • '; - common::printLink('execution', 'edit', "executionID={$kanbanID}", ' ' . $lang->kanban->edit, '', "class='iframe' data-width='75%'", '', true); + common::printLink('execution', 'edit', "executionID={$kanbanID}", '' . $lang->kanban->edit, '', "class='iframe' data-width='75%'", '', true); echo '
    • '; } if(!empty($executionActions[$kanbanID])) From 450ecef00852d72e7b37116b1dd924c339cae0a3 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 13 Jun 2022 10:12:29 +0800 Subject: [PATCH 2/2] * Fix bug #23201. --- module/group/lang/resource.php | 40 ++++++++++++++++------------------ 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 88bc014788..e7fd2ab128 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -197,29 +197,27 @@ if($config->systemMode == 'new') $lang->resource->program->unlinkStakeholder = 'unlinkStakeholder'; $lang->resource->program->batchUnlinkStakeholders = 'batchUnlinkStakeholders'; $lang->resource->program->unbindWhitelist = 'unbindWhitelist'; - $lang->resource->program->export = 'export'; $lang->resource->program->updateOrder = 'updateOrder'; - $lang->program->methodOrder[5] = 'browse'; - $lang->program->methodOrder[10] = 'kanban'; - $lang->program->methodOrder[15] = 'view'; - $lang->program->methodOrder[20] = 'product'; - $lang->program->methodOrder[25] = 'create'; - $lang->program->methodOrder[30] = 'edit'; - $lang->program->methodOrder[35] = 'view'; - $lang->program->methodOrder[40] = 'start'; - $lang->program->methodOrder[45] = 'suspend'; - $lang->program->methodOrder[50] = 'activate'; - $lang->program->methodOrder[55] = 'close'; - $lang->program->methodOrder[60] = 'delete'; - $lang->program->methodOrder[65] = 'project'; - $lang->program->methodOrder[70] = 'stakeholder'; - $lang->program->methodOrder[75] = 'createStakeholder'; - $lang->program->methodOrder[80] = 'unlinkStakeholder'; - $lang->program->methodOrder[85] = 'batchUnlinkStakeholders'; - $lang->program->methodOrder[90] = 'unbindWhitelist'; - $lang->program->methodOrder[95] = 'export'; - $lang->program->methodOrder[100] = 'updateOrder'; + $lang->program->methodOrder[5] = 'browse'; + $lang->program->methodOrder[10] = 'kanban'; + $lang->program->methodOrder[15] = 'view'; + $lang->program->methodOrder[20] = 'product'; + $lang->program->methodOrder[25] = 'create'; + $lang->program->methodOrder[30] = 'edit'; + $lang->program->methodOrder[35] = 'view'; + $lang->program->methodOrder[40] = 'start'; + $lang->program->methodOrder[45] = 'suspend'; + $lang->program->methodOrder[50] = 'activate'; + $lang->program->methodOrder[55] = 'close'; + $lang->program->methodOrder[60] = 'delete'; + $lang->program->methodOrder[65] = 'project'; + $lang->program->methodOrder[70] = 'stakeholder'; + $lang->program->methodOrder[75] = 'createStakeholder'; + $lang->program->methodOrder[80] = 'unlinkStakeholder'; + $lang->program->methodOrder[85] = 'batchUnlinkStakeholders'; + $lang->program->methodOrder[90] = 'unbindWhitelist'; + $lang->program->methodOrder[95] = 'updateOrder'; /* Program plan. */ $lang->resource->programplan = new stdclass();