From 990f1fb88cdefc5bd2845162a67a8b76982ea173 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 16 Dec 2021 09:35:50 +0800 Subject: [PATCH 1/2] * Add permission for card. --- module/group/lang/resource.php | 12 ++++++++++-- module/kanban/lang/en.php | 1 + module/kanban/lang/zh-cn.php | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 084ea3e497..1000775991 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -647,6 +647,10 @@ $lang->resource->kanban->editCard = 'editCard'; $lang->resource->kanban->viewCard = 'viewCard'; $lang->resource->kanban->sortCard = 'sortCard'; $lang->resource->kanban->archiveCard = 'archiveCard'; +$lang->resource->kanban->copyCard = 'copyCard'; +$lang->resource->kanban->deleteCard = 'deleteCard'; +$lang->resource->kanban->moveCard = 'moveCard'; +$lang->resource->kanban->setCardColor = 'setCardColor'; $lang->resource->kanban->laneMove = 'laneMove'; $lang->resource->kanban->cardsSort = 'cardsSort'; @@ -679,8 +683,12 @@ $lang->kanban->methodOrder[130] = 'editCard'; $lang->kanban->methodOrder[135] = 'viewCard'; $lang->kanban->methodOrder[140] = 'sortCard'; $lang->kanban->methodOrder[145] = 'archivedCard'; -$lang->kanban->methodOrder[150] = 'laneMove'; -$lang->kanban->methodOrder[155] = 'cardsSort'; +$lang->kanban->methodOrder[150] = 'copyCard'; +$lang->kanban->methodOrder[155] = 'deleteCard'; +$lang->kanban->methodOrder[160] = 'moveCard'; +$lang->kanban->methodOrder[165] = 'setCardColor'; +$lang->kanban->methodOrder[170] = 'laneMove'; +$lang->kanban->methodOrder[175] = 'cardsSort'; /* Execution. */ $lang->resource->execution = new stdclass(); diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index dbc3d84e56..5a7a29ceca 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -30,6 +30,7 @@ $lang->kanban->sortCard = 'Sort Card'; $lang->kanban->copyCard = 'Copy Card'; $lang->kanban->moveCard = 'Move Card'; $lang->kanban->cardColor = 'Card Color'; +$lang->kanban->setCardColor = 'Set Card Color'; $lang->kanban->deleteCard = 'Delete Card'; $lang->kanban->setting = 'Setting'; $lang->kanban->splitColumn = 'Split Column'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 627835e15f..071ac87e0c 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -30,6 +30,7 @@ $lang->kanban->sortCard = '卡片排序'; $lang->kanban->copyCard = '复制卡片'; $lang->kanban->moveCard = '移动卡片'; $lang->kanban->cardColor = '卡片颜色'; +$lang->kanban->setCardColor = '设置卡片颜色'; $lang->kanban->deleteCard = '删除卡片'; $lang->kanban->setting = '设置'; $lang->kanban->splitColumn = '新增子看板列'; From 27ee4d87ed48a01dd5b38abeaa8785a08437cb69 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Thu, 16 Dec 2021 05:15:08 +0000 Subject: [PATCH 2/2] Fix bug 17524. --- module/design/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/design/control.php b/module/design/control.php index 38534b115b..1ef8b05dc4 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -77,7 +77,7 @@ class design extends control /* Print top and right actions. */ $this->lang->TRActions = '
'; - if($this->config->maxVersion) + if($this->config->maxVersion and common::hasPriv('design', 'submit')) { $this->lang->TRActions .= '
'; $this->lang->TRActions .= html::a($this->createLink('design', 'submit', "productID=$productID", '', true), " {$this->lang->design->createReview}", '', "class='btn btn-secondary iframe'");