Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'kanban' into 'sprint/179_liumengyi_addpriv'

Browse Source 
# Conflicts:
#   module/group/lang/resource.php
This commit is contained in:
孙广明
2021-12-16 06:14:24 +00:00
parent 21d7584660 0ce78c1930
commit 50f207d053
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/design/control.php
+1 -1
View File
@@ -77,7 +77,7 @@ class design extends control
/* Print top and right actions. */
$this->lang->TRActions = '<div class="btn-toolbar pull-right">';
if($this->config->maxVersion)
if($this->config->maxVersion and common::hasPriv('design', 'submit'))
{
$this->lang->TRActions .= '<div class="btn-group">';
$this->lang->TRActions .= html::a($this->createLink('design', 'submit', "productID=$productID", '', true), "<i class='icon-plus'></i> {$this->lang->design->createReview}", '', "class='btn btn-secondary iframe'");
module/group/lang/resource.php
+10 -6
View File
@@ -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();
module/kanban/lang/en.php
+1
View File
@@ -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';
module/kanban/lang/zh-cn.php
+1
View File
@@ -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 = '设置';