diff --git a/db/update16.2.sql b/db/update16.2.sql index f2d290914f..391d35bf3e 100644 --- a/db/update16.2.sql +++ b/db/update16.2.sql @@ -4,7 +4,7 @@ UPDATE `zt_kanbanspace` SET `type` = 'cooperation'; ALTER TABLE `zt_kanban` ADD `importObject` varchar(255) NOT NULL AFTER `displayCards`; ALTER TABLE `zt_kanban` ADD `performable` enum ('0', '1') NOT NULL DEFAULT '0' AFTER `archived`; -ALTER TABLE `zt_kanbancard` ADD `fromID` int NOT NULL AFTER `group`; +ALTER TABLE `zt_kanbancard` ADD `fromID` int(8) NOT NULL AFTER `group`; ALTER TABLE `zt_kanbancard` ADD `fromType` varchar(50) NOT NULL AFTER `fromID`; ALTER TABLE `zt_job` ADD `sonarqubeServer` mediumint(8) unsigned NOT NULL AFTER `triggerType`; diff --git a/module/kanban/control.php b/module/kanban/control.php index 256c2c5771..8d0535bef3 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1057,13 +1057,13 @@ class kanban extends control } /** - * Set done function. + * Set archived. * * @param int $kanbanID * @access public * @return void */ - public function setArchivedFunction($kanbanID) + public function enableArchived($kanbanID) { if(!empty($_POST)) { diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 16c5c91e17..06e443bbf1 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -39,7 +39,7 @@ $lang->kanban->assigntoCard = 'Assign'; $lang->kanban->setting = 'Setting'; $lang->kanban->setDoneFunction = 'Set Done Function'; $lang->kanban->doneFunction = 'Done Function'; -$lang->kanban->setArchivedFunction = 'Set Archived Function'; +$lang->kanban->enableArchived = 'Set Archived Function'; $lang->kanban->ArchivedFunction = 'Archived 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 a907a0f9b7..2902314bd0 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -39,7 +39,7 @@ $lang->kanban->assigntoCard = '指派'; $lang->kanban->setting = '设置'; $lang->kanban->setDoneFunction = '设置完成功能'; $lang->kanban->doneFunction = '完成功能'; -$lang->kanban->setArchivedFunction = '设置归档功能'; +$lang->kanban->enableArchived = '设置归档功能'; $lang->kanban->ArchivedFunction = '归档功能'; $lang->kanban->splitColumn = '新增子看板列'; $lang->kanban->createColumnOnLeft = '左侧新增看板列'; diff --git a/module/kanban/model.php b/module/kanban/model.php index 0034bdd01c..e04d42935e 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -2538,7 +2538,7 @@ class kanbanModel extends model $actions .= "