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'"); diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index e3c111dde1..d68d50eef4 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -647,9 +647,11 @@ $lang->resource->kanban->editCard = 'editCard'; $lang->resource->kanban->viewCard = 'viewCard'; $lang->resource->kanban->sortCard = 'sortCard'; $lang->resource->kanban->archiveCard = 'archiveCard'; -$lang->resource->kanban->deleteCard = 'deleteCard'; -$lang->resource->kanban->copyCard = 'copyCard'; $lang->resource->kanban->assigntoCard = 'assigntoCard'; +$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'; @@ -682,11 +684,13 @@ $lang->kanban->methodOrder[130] = 'editCard'; $lang->kanban->methodOrder[135] = 'viewCard'; $lang->kanban->methodOrder[140] = 'sortCard'; $lang->kanban->methodOrder[145] = 'archivedCard'; -$lang->kanban->methodOrder[150] = 'deleteCard'; -$lang->kanban->methodOrder[155] = 'copyCard'; +$lang->kanban->methodOrder[150] = 'copyCard'; +$lang->kanban->methodOrder[155] = 'deleteCard'; $lang->kanban->methodOrder[160] = 'assigntoCard'; -$lang->kanban->methodOrder[165] = 'laneMove'; -$lang->kanban->methodOrder[170] = 'cardsSort'; +$lang->kanban->methodOrder[165] = 'moveCard'; +$lang->kanban->methodOrder[170] = 'setCardColor'; +$lang->kanban->methodOrder[175] = 'laneMove'; +$lang->kanban->methodOrder[180] = 'cardsSort'; /* Execution. */ $lang->resource->execution = new stdclass(); diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 237cd0a3d7..58b63bc879 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->assigntoCard = 'Assign'; $lang->kanban->setting = 'Setting'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index f3e96306a1..dcaa2f72aa 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->assigntoCard = '指派'; $lang->kanban->setting = '设置';