diff --git a/module/kanban/control.php b/module/kanban/control.php index 17bd52d4e3..256c2c5771 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1055,6 +1055,28 @@ class kanban extends control $this->display(); } + + /** + * Set done function. + * + * @param int $kanbanID + * @access public + * @return void + */ + public function setArchivedFunction($kanbanID) + { + if(!empty($_POST)) + { + $this->dao->update(TABLE_KANBAN)->set('archived')->eq($_POST['archived'])->exec(); + + if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); + } + + $this->view->kanban = $this->kanban->getByID($kanbanID); + + $this->display(); + } /** * AJAX: Update the cards sorting of the lane column. diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 246d4696c6..1450c6df30 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -259,6 +259,15 @@ function renderKanbanItem(item, $item) var privs = item.actions; var printMoreBtn = (privs.includes('editCard') || privs.includes('archiveCard') || privs.includes('copyCard') || privs.includes('deleteCard') || privs.includes('moveCard') || privs.includes('setCardColor')); + if(kanban.performable == 1 && item.status == 'done' ) + { + $item.closest('.kanban-card').css({'filter' : 'opacity(0.5)', 'text-decoration' : 'line-through'}); + } + else + { + $item.closest('.kanban-card').css({'filter' : '', 'text-decoration' : ''}); + } + if(privs.includes('sortCard')) $item.parent().addClass('sort'); if(!$title.length) { diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 34b8a9b2fc..16c5c91e17 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -37,8 +37,10 @@ $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->doneFunction = 'Done function'; +$lang->kanban->setDoneFunction = 'Set Done Function'; +$lang->kanban->doneFunction = 'Done Function'; +$lang->kanban->setArchivedFunction = 'Set Archived Function'; +$lang->kanban->ArchivedFunction = 'Archived Function'; $lang->kanban->splitColumn = 'Split Column'; $lang->kanban->createColumnOnLeft = 'Create Column On Left'; $lang->kanban->createColumnOnRight = 'Create Column On Right'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index bb5128da88..a907a0f9b7 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -39,6 +39,8 @@ $lang->kanban->assigntoCard = '指派'; $lang->kanban->setting = '设置'; $lang->kanban->setDoneFunction = '设置完成功能'; $lang->kanban->doneFunction = '完成功能'; +$lang->kanban->setArchivedFunction = '设置归档功能'; +$lang->kanban->ArchivedFunction = '归档功能'; $lang->kanban->splitColumn = '新增子看板列'; $lang->kanban->createColumnOnLeft = '左侧新增看板列'; $lang->kanban->createColumnOnRight = '右侧新增看板列'; diff --git a/module/kanban/model.php b/module/kanban/model.php index 5a45356b04..0034bdd01c 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -2538,7 +2538,7 @@ class kanbanModel extends model $actions .= "