diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index e0a6e1816f..f9ede55dc2 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -644,7 +644,7 @@ $lang->resource->kanban->close = 'close'; $lang->resource->kanban->delete = 'delete'; $lang->resource->kanban->createRegion = 'createRegion'; $lang->resource->kanban->editRegion = 'editRegion'; -$lang->resource->kanban->setDoneFunction = 'setDoneFunction'; +$lang->resource->kanban->performable = 'performable'; $lang->resource->kanban->sortRegion = 'sortRegion'; $lang->resource->kanban->sortGroup = 'sortGroup'; $lang->resource->kanban->deleteRegion = 'deleteRegion'; @@ -670,7 +670,7 @@ $lang->resource->kanban->assigntoCard = 'assigntoCard'; $lang->resource->kanban->deleteCard = 'deleteCard'; $lang->resource->kanban->moveCard = 'moveCard'; $lang->resource->kanban->finishCard = 'finishCard'; -$lang->resource->kanban->activeCard = 'activeCard'; +$lang->resource->kanban->activateCard = 'activateCard'; $lang->resource->kanban->setCardColor = 'setCardColor'; $lang->resource->kanban->laneMove = 'laneMove'; $lang->resource->kanban->viewArchivedColumn = 'viewArchivedColumn'; diff --git a/module/kanban/control.php b/module/kanban/control.php index bde75c8692..0f75d68324 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -752,14 +752,14 @@ class kanban extends control } /** - * Active a card. + * Activate a card. * * @param int $cardID * @param int $kanbanID * @access public * @return void */ - public function activeCard($cardID, $kanbanID) + public function activate($cardID, $kanbanID) { $this->dao->update(TABLE_KANBANCARD)->set('status')->eq('doing')->where('id')->eq($cardID)->exec(); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); @@ -1069,13 +1069,13 @@ class kanban extends control } /** - * Set done function. + * Setup done function. * * @param int $kanbanID * @access public * @return void */ - public function setDoneFunction($kanbanID) + public function performable($kanbanID) { if(!empty($_POST)) { diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 5e298ae439..f6472f1932 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -257,7 +257,7 @@ function renderKanbanItem(item, $item) { var $title = $item.children('.title'); var privs = item.actions; - var printMoreBtn = (privs.includes('editCard') || privs.includes('finishCard') || privs.includes('activeCard') ||privs.includes('archiveCard') || privs.includes('copyCard') || privs.includes('deleteCard') || privs.includes('moveCard') || privs.includes('setCardColor')); + var printMoreBtn = (privs.includes('editCard') || privs.includes('finishCard') || privs.includes('activateCard') ||privs.includes('archiveCard') || privs.includes('copyCard') || privs.includes('deleteCard') || privs.includes('moveCard') || privs.includes('setCardColor')); if(privs.includes('sortCard')) $item.parent().addClass('sort'); if(!$title.length) @@ -472,7 +472,7 @@ function finishCard(cardID, kanbanID, regionID) } /** - * Active a card. + * Activate a card. * * @param int $cardID * @param int $kanbanID @@ -480,10 +480,10 @@ function finishCard(cardID, kanbanID, regionID) * @access public * @return void */ -function activeCard(cardID, kanbanID, regionID) +function activateCard(cardID, kanbanID, regionID) { if(!cardID) return false; - var url = createLink('kanban', 'activeCard', 'cardID=' + cardID + '&kanbanID=' + kanbanID); + var url = createLink('kanban', 'activateCard', 'cardID=' + cardID + '&kanbanID=' + kanbanID); return $.ajax( { method: 'post', @@ -750,9 +750,9 @@ function createCardMenu(options) if(privs.includes('editCard')) items.push({label: kanbanLang.editCard, icon: 'edit', url: createLink('kanban', 'editCard', 'cardID=' + card.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(kanban.performable == 1) { - if(privs.includes('activeCard') && card.status != 'doing') + if(privs.includes('activateCard') && card.status != 'doing') { - items.push({label: kanbanLang.activeCard, icon: 'magic', onClick: function(){activeCard(card.id, card.kanban, card.region);}}); + items.push({label: kanbanLang.activateCard, icon: 'magic', onClick: function(){activateCard(card.id, card.kanban, card.region);}}); } else { diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 2cc8d684f4..08cadf01c1 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -28,7 +28,7 @@ $lang->kanban->deleteColumn = 'Delete Column'; $lang->kanban->createCard = 'Create Card'; $lang->kanban->editCard = 'Edit Card'; $lang->kanban->finishCard = 'Finish Card'; -$lang->kanban->activeCard = 'Active Card'; +$lang->kanban->activateCard = 'Activate Card'; $lang->kanban->viewCard = 'View Card'; $lang->kanban->archiveCard = 'Archive Card'; $lang->kanban->sortCard = 'Sort Card'; @@ -39,7 +39,7 @@ $lang->kanban->setCardColor = 'Set Card Color'; $lang->kanban->deleteCard = 'Delete Card'; $lang->kanban->assigntoCard = 'Assign'; $lang->kanban->setting = 'Setting'; -$lang->kanban->setDoneFunction = 'Set done function'; +$lang->kanban->performable = 'Set done function'; $lang->kanban->doneFunction = 'Done function'; $lang->kanban->splitColumn = 'Split Column'; $lang->kanban->createColumnOnLeft = 'Create Column On Left'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 88abfbd07a..40e8a61fb3 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -28,7 +28,7 @@ $lang->kanban->deleteColumn = '删除看板列'; $lang->kanban->createCard = '创建卡片'; $lang->kanban->editCard = '编辑卡片'; $lang->kanban->finishCard = '完成卡片'; -$lang->kanban->activeCard = '激活卡片'; +$lang->kanban->activateCard = '激活卡片'; $lang->kanban->viewCard = '查看卡片'; $lang->kanban->archiveCard = '归档卡片'; $lang->kanban->sortCard = '卡片排序'; @@ -39,7 +39,7 @@ $lang->kanban->setCardColor = '设置卡片颜色'; $lang->kanban->deleteCard = '删除卡片'; $lang->kanban->assigntoCard = '指派'; $lang->kanban->setting = '设置'; -$lang->kanban->setDoneFunction = '设置完成功能'; +$lang->kanban->performable = '设置完成功能'; $lang->kanban->doneFunction = '完成功能'; $lang->kanban->splitColumn = '新增子看板列'; $lang->kanban->createColumnOnLeft = '左侧新增看板列'; diff --git a/module/kanban/model.php b/module/kanban/model.php index 140289a6b0..67c02813c5 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -872,7 +872,7 @@ class kanbanModel extends model ->andWhere('type')->eq('common') ->fetchAll(); - $actions = array('editCard', 'finishCard', 'activeCard', 'archiveCard', 'deleteCard', 'moveCard', 'setCardColor', 'viewCard', 'sortCard'); + $actions = array('editCard', 'finishCard', 'activateCard', 'archiveCard', 'deleteCard', 'moveCard', 'setCardColor', 'viewCard', 'sortCard'); $cardGroup = array(); foreach($cellList as $cell) { @@ -2533,7 +2533,7 @@ class kanbanModel extends model $actions .= "