From 9b500daa08064bab611a7188e60b66bc1f4b7f48 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Fri, 21 Jan 2022 11:21:52 +0800 Subject: [PATCH 01/14] *Finish task 47997 48003. --- module/kanban/control.php | 22 ++++++++++++ module/kanban/js/view.js | 9 +++++ module/kanban/lang/en.php | 6 ++-- module/kanban/lang/zh-cn.php | 2 ++ module/kanban/model.php | 5 +-- .../kanban/view/setarchivedfunction.html.php | 35 +++++++++++++++++++ 6 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 module/kanban/view/setarchivedfunction.html.php 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 .= "
"; $actions .= " {$this->lang->kanban->fullScreen}"; - $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'delete')); + $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'setArchivedFunction') or common::hasPriv('kanban', 'delete')); if($printSettingBtn) { @@ -2546,6 +2546,7 @@ class kanbanModel extends model $actions .= ""; } diff --git a/module/kanban/view/setarchivedfunction.html.php b/module/kanban/view/setarchivedfunction.html.php new file mode 100644 index 0000000000..cb1ae20bc2 --- /dev/null +++ b/module/kanban/view/setarchivedfunction.html.php @@ -0,0 +1,35 @@ + + * @package kanban + * @version $Id: setarchivedfunction.html.php 935 2022-01-21 11:02:24Z $ + * @link https://www.zentao.net + */ +?> + +
+
+
+

kanban->setArchivedFunction;?>

+
+
+ + + + + + + + +
kanban->ArchivedFunction;?>kanban->enableArchived, $kanban->archived));?>
+ +
+
+
+
+ + From 446f6e59d3349547d4b34eec616bf4c93283fc94 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Fri, 21 Jan 2022 14:30:13 +0800 Subject: [PATCH 02/14] *Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003. --- db/update16.2.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/update16.2.sql b/db/update16.2.sql index 4f96443350..f2d290914f 100644 --- a/db/update16.2.sql +++ b/db/update16.2.sql @@ -4,5 +4,8 @@ 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 `fromType` varchar(50) NOT NULL AFTER `fromID`; + ALTER TABLE `zt_job` ADD `sonarqubeServer` mediumint(8) unsigned NOT NULL AFTER `triggerType`; -ALTER TABLE `zt_job` ADD `projectKey` varchar(255) NOT NULL AFTER `sonarqubeServer`; \ No newline at end of file +ALTER TABLE `zt_job` ADD `projectKey` varchar(255) NOT NULL AFTER `sonarqubeServer`; From 2e030b874c18d9783acca3687230bdc68d635011 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 21 Jan 2022 14:59:21 +0800 Subject: [PATCH 03/14] * Fix bug #18806. --- module/kanban/js/view.js | 21 +++++++++++++++------ module/kanban/model.php | 3 ++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index ca041f600f..2901c48c42 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -393,6 +393,7 @@ function moveCard(cardID, fromColID, toColID, fromLaneID, toLaneID, kanbanID, re method: 'post', dataType: 'json', url: url, + async: false, success: function(data) { regions = data; @@ -844,7 +845,7 @@ function createColumnCreateMenu(options) var laneID = col.$kanbanData.lanes[0].id ? col.$kanbanData.lanes[0].id : 0; var columnID = col.id; - if(privs.includes('createCard')) items.push({label: kanbanLang.createCard, url: $.createLink('kanban', 'createCard', 'kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&laneID=' + laneID + '&columnID=' + columnID), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); + if(privs.includes('createCard')) items.push({label: kanbanLang.createCard, url: $.createLink('kanban', 'createCard', 'kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(privs.includes('batchCreateCard')) items.push({label: kanbanLang.batchCreateCard, url: $.createLink('kanban', 'batchCreateCard', 'kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&laneID=' + laneID + '&columnID=' + columnID), attrs: {'data-width': '80%'}}); return items; } @@ -1010,8 +1011,10 @@ $(function() }); /* Init sortable */ - var sortType = ''; - var $cards = null; + var sortType = ''; + var oldLaneID = ''; + var oldColID = ''; + var $cards = null; $('#kanban').sortable( { selector: '.region, .kanban-board, .kanban-lane, .kanban-item.sort', @@ -1066,6 +1069,12 @@ $(function() $('.region').find('.kanban').hide(); hideKanbanAction(); } + + if(sortType == 'card') + { + oldLaneID = e.element.closest('.kanban-lane').data('id'); + oldColID = e.element.closest('.kanban-col').data('id'); + } }, finish: function(e) { @@ -1101,9 +1110,9 @@ $(function() } if(sortType == 'card') { - var laneID = e.element.closest('.kanban-lane').data('id'); - var columnID = e.element.closest('.kanban-col').data('id'); - url = createLink('kanban', 'sortCard', 'kanbanID=' + kanbanID + '&laneID=' + laneID + '&columnID=' + columnID + '&cards=' + orders.join(',')); + var newLaneID = e.element.closest('.kanban-lane').data('id'); + var newColID = e.element.closest('.kanban-col').data('id'); + if(newLaneID == oldLaneID && newColID == oldColID) url = createLink('kanban', 'sortCard', 'kanbanID=' + kanbanID + '&laneID=' + newLaneID + '&columnID=' + newColID + '&cards=' + orders.join(',')); } if(!url) return true; diff --git a/module/kanban/model.php b/module/kanban/model.php index a8c339cf93..2a042c1969 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -2709,9 +2709,10 @@ class kanbanModel extends model $fromCellCards = $this->dao->select('cards')->from(TABLE_KANBANCELL)->where('lane')->eq($fromLaneID)->andWhere('`column`')->eq($fromColID)->fetch('cards'); $toCellCards = $this->dao->select('cards')->from(TABLE_KANBANCELL)->where('lane')->eq($toLaneID)->andWhere('`column`')->eq($toColID)->fetch('cards'); - $fromCardList = str_replace("$cardID,", '', $fromCellCards); + $fromCardList = str_replace(",$cardID,", ',', $fromCellCards); $toCardList = rtrim($toCellCards, ',') . ",$cardID,"; + if($fromCardList == ',') $fromCardList = ''; $this->dao->update(TABLE_KANBANCELL)->set('cards')->eq($fromCardList)->where('`column`')->eq($fromColID)->andWhere('lane')->eq($fromLaneID)->exec(); $this->dao->update(TABLE_KANBANCELL)->set('cards')->eq($toCardList)->where('`column`')->eq($toColID)->andWhere('lane')->eq($toLaneID)->exec(); } From 3f15a1e01603b06f17adb4c41bcf53a5bd5e7c33 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 21 Jan 2022 15:04:25 +0800 Subject: [PATCH 04/14] * Fix bug #18806. --- module/execution/js/kanban.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index b392edf00e..dac7ee3352 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -927,6 +927,7 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car method: 'post', dataType: 'json', url: link, + async: false, success: function(data) { updateRegion(regionID, data[regionID]); @@ -993,6 +994,7 @@ function shiftCard(objectID, fromColID, toColID, fromLaneID, toLaneID, regionID) method: 'post', dataType: 'json', url: link, + async: false, success: function(data) { updateRegion(regionID, data[regionID]); @@ -1229,13 +1231,6 @@ $(function() return $ele.parent().children('.kanban-lane'); } - - /* Sort lanes */ - if($ele.hasClass('kanban-item')) - { - sortType = 'item'; - return $ele.parent().children('.kanban-item'); - } }, start: function(e) { @@ -1284,10 +1279,7 @@ $(function() var region = e.element.parent().parent().data('id'); url = createLink('kanban', 'sortLane', 'region=' + region + '&lanes=' + orders.join(',')); } - if(sortType == 'item') - { - url = createLink('task', 'sort', 'kanbanID=' + kanbanID + '&tasks=' + orders.join(',')); - } + if(!url) return true; $.getJSON(url, function(response) From 78dc1af6bdde87178f0de241a6024be3a4ff29b3 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 21 Jan 2022 15:40:56 +0800 Subject: [PATCH 05/14] * Modify the format. --- module/kanban/js/view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 2901c48c42..11d1949bf1 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -1011,10 +1011,10 @@ $(function() }); /* Init sortable */ - var sortType = ''; + var sortType = ''; var oldLaneID = ''; var oldColID = ''; - var $cards = null; + var $cards = null; $('#kanban').sortable( { selector: '.region, .kanban-board, .kanban-lane, .kanban-item.sort', From e34ea32b169f94a3e8654c61bca208a0b9b73367 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 21 Jan 2022 17:27:40 +0800 Subject: [PATCH 06/14] * Fix bug for task#47976. --- module/kanban/view/create.html.php | 4 ---- module/kanban/view/edit.html.php | 4 ---- 2 files changed, 8 deletions(-) diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index 801a74ab6a..f1f8d4a00e 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -33,10 +33,6 @@ kanban->name;?> - - kanban->archived;?> - kanban->enableArchived, '0');?> - kanban->owner;?> diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php index 328777edbd..585028f9af 100644 --- a/module/kanban/view/edit.html.php +++ b/module/kanban/view/edit.html.php @@ -26,10 +26,6 @@ kanban->name;?> name, "class='form-control'");?> - - kanban->archived;?> - kanban->enableArchived, $kanban->archived);?> - kanban->owner;?> From f06c5c5e30f8c5d864b0f9e1daa4068d4728d96e Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Mon, 24 Jan 2022 08:36:25 +0800 Subject: [PATCH 07/14] *Finish task 47997 48003. --- db/update16.2.sql | 2 +- module/kanban/control.php | 4 ++-- module/kanban/lang/en.php | 2 +- module/kanban/lang/zh-cn.php | 2 +- module/kanban/model.php | 6 +++--- module/kanban/view/setarchivedfunction.html.php | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) 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 .= "
"; $actions .= " {$this->lang->kanban->fullScreen}"; - $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'setArchivedFunction') or common::hasPriv('kanban', 'delete')); + $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'delete')); if($printSettingBtn) { @@ -2546,7 +2546,7 @@ class kanbanModel extends model $actions .= "
    "; if(common::hasPriv('kanban', 'createRegion')) $actions .= '
  • ' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$kanban->id", '', true), '' . $this->lang->kanban->createRegion, '', "class='iframe btn btn-link'") . '
    • '; if(common::hasPriv('kanban', 'import')) $actions .= '
  • ' . html::a(helper::createLink('kanban', 'import', "kanbanID=$kanban->id", '', true), '' . $this->lang->kanban->import, '', "class='iframe btn btn-link'") . '
    • '; - if(common::hasPriv('kanban', 'setArchivedFunction')) $actions .= '
  • ' . html::a(helper::createLink('kanban', 'setArchivedFunction', "kanbanID=$kanban->id", '', true), '' . $this->lang->kanban->archived, '', "class='iframe btn btn-link'") . '
    • '; + if(common::hasPriv('kanban', 'enableArchived')) $actions .= '
  • ' . html::a(helper::createLink('kanban', 'enableArchived', "kanbanID=$kanban->id", '', true), '' . $this->lang->kanban->archived, '', "class='iframe btn btn-link'") . '
    • '; if($printSetHeight) { $width = $this->app->getClientLang() == 'en' ? '70%' : '60%'; @@ -2562,7 +2562,7 @@ class kanbanModel extends model if(common::hasPriv('kanban', 'delete')) $kanbanActions .= '
  • ' . html::a(helper::createLink('kanban', 'delete', "kanbanID=$kanban->id"), '' . $this->lang->kanban->delete, 'hiddenwin', "class='btn btn-link'") . '
    • '; if($kanbanActions) { - $actions .= ((common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction')) and (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'setArchivedFunction') or common::hasPriv('kanban', 'delete'))) ? "
    " . $kanbanActions : $kanbanActions; + $actions .= ((common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction')) and (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'delete'))) ? "
    " . $kanbanActions : $kanbanActions; } $actions .= "
"; } diff --git a/module/kanban/view/setarchivedfunction.html.php b/module/kanban/view/setarchivedfunction.html.php index cb1ae20bc2..f50b8f665d 100644 --- a/module/kanban/view/setarchivedfunction.html.php +++ b/module/kanban/view/setarchivedfunction.html.php @@ -14,7 +14,7 @@
-

kanban->setArchivedFunction;?>

+

kanban->enableArchived;?>

From 23c9ebab657e28fe020cd1a4e208c898d13957b5 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Mon, 24 Jan 2022 08:47:23 +0800 Subject: [PATCH 08/14] *Finish task 47997 48003. --- module/kanban/lang/en.php | 2 +- .../{setarchivedfunction.html.php => enablearchived.html.php} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename module/kanban/view/{setarchivedfunction.html.php => enablearchived.html.php} (95%) diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 06e443bbf1..f4ad448551 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->enableArchived = 'Set Archived Function'; +$lang->kanban->enableArchived = 'Enable Archived'; $lang->kanban->ArchivedFunction = 'Archived Function'; $lang->kanban->splitColumn = 'Split Column'; $lang->kanban->createColumnOnLeft = 'Create Column On Left'; diff --git a/module/kanban/view/setarchivedfunction.html.php b/module/kanban/view/enablearchived.html.php similarity index 95% rename from module/kanban/view/setarchivedfunction.html.php rename to module/kanban/view/enablearchived.html.php index f50b8f665d..2b3717ac20 100644 --- a/module/kanban/view/setarchivedfunction.html.php +++ b/module/kanban/view/enablearchived.html.php @@ -1,6 +1,6 @@ Date: Mon, 24 Jan 2022 08:53:14 +0800 Subject: [PATCH 09/14] *Finish task 47997 48003. --- module/kanban/lang/en.php | 4 +--- module/kanban/lang/zh-cn.php | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index f4ad448551..8c4eea95a8 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -37,10 +37,8 @@ $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->enableArchived = 'Enable Archived'; -$lang->kanban->ArchivedFunction = '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 2902314bd0..f9f3e2ef16 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -37,10 +37,8 @@ $lang->kanban->setCardColor = '设置卡片颜色'; $lang->kanban->deleteCard = '删除卡片'; $lang->kanban->assigntoCard = '指派'; $lang->kanban->setting = '设置'; -$lang->kanban->setDoneFunction = '设置完成功能'; -$lang->kanban->doneFunction = '完成功能'; $lang->kanban->enableArchived = '设置归档功能'; -$lang->kanban->ArchivedFunction = '归档功能'; +$lang->kanban->archivedFunction = '归档功能'; $lang->kanban->splitColumn = '新增子看板列'; $lang->kanban->createColumnOnLeft = '左侧新增看板列'; $lang->kanban->createColumnOnRight = '右侧新增看板列'; From 3c7f9cf5299843b5d4c637595e888871740a3e9a Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 24 Jan 2022 08:54:03 +0800 Subject: [PATCH 10/14] * Add import permission. --- module/group/lang/resource.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 73bfca9b2e..5c33bb7baa 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -678,6 +678,7 @@ $lang->resource->kanban->viewArchivedCard = 'viewArchivedCard'; $lang->resource->kanban->restoreCard = 'restoreCard'; $lang->resource->kanban->setLaneHeight = 'setLaneHeight'; $lang->resource->kanban->batchCreateCard = 'batchCreateCard'; +$lang->resource->kanban->import = 'import'; $lang->kanban->methodOrder[5] = 'space'; $lang->kanban->methodOrder[10] = 'createSpace'; @@ -724,7 +725,7 @@ $lang->kanban->methodorder[205] = 'archiveColumn'; $lang->kanban->methodorder[210] = 'restoreCard'; $lang->kanban->methodorder[215] = 'setLaneHeight'; $lang->kanban->methodOrder[220] = 'batchCreateCard'; -$lang->kanban->methodorder[220] = 'import'; +$lang->kanban->methodorder[225] = 'import'; /* Execution. */ $lang->resource->execution = new stdclass(); From b323508a0b73aea4bd0567b60ac50abfd30de93d Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Mon, 24 Jan 2022 08:56:29 +0800 Subject: [PATCH 11/14] *Finish task 47997 48003. --- module/kanban/view/enablearchived.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/kanban/view/enablearchived.html.php b/module/kanban/view/enablearchived.html.php index 2b3717ac20..cfa20294b0 100644 --- a/module/kanban/view/enablearchived.html.php +++ b/module/kanban/view/enablearchived.html.php @@ -6,7 +6,7 @@ * @license ZPL (http://zpl.pub/page/zplv12.html) * @author Runyu Zheng * @package kanban - * @version $Id: setarchivedfunction.html.php 935 2022-01-21 11:02:24Z $ + * @version $Id: enableArchived.html.php 935 2022-01-21 11:02:24Z $ * @link https://www.zentao.net */ ?> @@ -19,7 +19,7 @@
- + From 87463359ec508d5681017bbd05a309566ba987e1 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Mon, 24 Jan 2022 09:02:29 +0800 Subject: [PATCH 12/14] *Finish task 47997 48003. --- module/kanban/lang/en.php | 2 +- module/kanban/lang/zh-cn.php | 2 +- module/kanban/view/enablearchived.html.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 8c4eea95a8..1be70c7b19 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -38,7 +38,7 @@ $lang->kanban->deleteCard = 'Delete Card'; $lang->kanban->assigntoCard = 'Assign'; $lang->kanban->setting = 'Setting'; $lang->kanban->enableArchived = 'Enable Archived'; -$lang->kanban->archivedFunction = 'Archived Function'; +$lang->kanban->archive = 'Archive'; $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 f9f3e2ef16..2017f82f69 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -38,7 +38,7 @@ $lang->kanban->deleteCard = '删除卡片'; $lang->kanban->assigntoCard = '指派'; $lang->kanban->setting = '设置'; $lang->kanban->enableArchived = '设置归档功能'; -$lang->kanban->archivedFunction = '归档功能'; +$lang->kanban->archive = '归档功能'; $lang->kanban->splitColumn = '新增子看板列'; $lang->kanban->createColumnOnLeft = '左侧新增看板列'; $lang->kanban->createColumnOnRight = '右侧新增看板列'; diff --git a/module/kanban/view/enablearchived.html.php b/module/kanban/view/enablearchived.html.php index cfa20294b0..af75d36b17 100644 --- a/module/kanban/view/enablearchived.html.php +++ b/module/kanban/view/enablearchived.html.php @@ -19,7 +19,7 @@
kanban->ArchivedFunction;?>kanban->archivedFunction;?> kanban->enableArchived, $kanban->archived));?>
- + From ea3c1dd61ba48774cf53df8c4879fed5f1509477 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Mon, 24 Jan 2022 09:12:19 +0800 Subject: [PATCH 13/14] *Finish task 47997 48003. --- module/kanban/lang/en.php | 4 ++-- module/kanban/lang/zh-cn.php | 4 ++-- module/kanban/view/enablearchived.html.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 1be70c7b19..a7084bbe70 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -95,8 +95,8 @@ $lang->kanban->aclGroup['extend'] = 'Extend'; $lang->kanban->aclList['extend'] = 'Extend (Accessible with space view permissions)'; $lang->kanban->aclList['private'] = 'Private (For the kanban team, whitelist members and space owner only)'; -$lang->kanban->enableArchived['0'] = 'No Enable'; -$lang->kanban->enableArchived['1'] = 'Enable'; +$lang->kanban->enableArchive['0'] = 'No Enable'; +$lang->kanban->enableArchivd['1'] = 'Enable'; $lang->kanban->enableFinished['0'] = 'No Enable'; $lang->kanban->enableFinished['1'] = 'Enable'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 2017f82f69..e542383166 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -95,8 +95,8 @@ $lang->kanban->aclGroup['extend'] = '继承空间'; $lang->kanban->aclList['extend'] = '继承空间访问权限（能访问当前空间，即可访问）'; $lang->kanban->aclList['private'] = '私有（看板团队成员、白名单、空间负责人可访问）'; -$lang->kanban->enableArchived['0'] = '不启用'; -$lang->kanban->enableArchived['1'] = '启用'; +$lang->kanban->enableArchive['0'] = '不启用'; +$lang->kanban->enableArchive['1'] = '启用'; $lang->kanban->enableFinished['0'] = '不启用'; $lang->kanban->enableFinished['1'] = '启用'; diff --git a/module/kanban/view/enablearchived.html.php b/module/kanban/view/enablearchived.html.php index af75d36b17..d86565a114 100644 --- a/module/kanban/view/enablearchived.html.php +++ b/module/kanban/view/enablearchived.html.php @@ -20,7 +20,7 @@
kanban->archivedFunction;?>kanban->archive;?> kanban->enableArchived, $kanban->archived));?>
- +
kanban->archive;?>kanban->enableArchived, $kanban->archived));?>kanban->enableArchive, $kanban->archived));?>
From 18b70fac641508584d890ff1d7aeebd30654f65d Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Mon, 24 Jan 2022 09:22:56 +0800 Subject: [PATCH 14/14] *Finish task 47997 48003. --- module/kanban/lang/en.php | 4 ++-- module/kanban/lang/zh-cn.php | 4 ++-- module/kanban/view/enablearchived.html.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index a7084bbe70..8a285e10b2 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -95,8 +95,8 @@ $lang->kanban->aclGroup['extend'] = 'Extend'; $lang->kanban->aclList['extend'] = 'Extend (Accessible with space view permissions)'; $lang->kanban->aclList['private'] = 'Private (For the kanban team, whitelist members and space owner only)'; -$lang->kanban->enableArchive['0'] = 'No Enable'; -$lang->kanban->enableArchivd['1'] = 'Enable'; +$lang->kanban->archiveList['0'] = 'No Enable'; +$lang->kanban->archiveList['1'] = 'Enable'; $lang->kanban->enableFinished['0'] = 'No Enable'; $lang->kanban->enableFinished['1'] = 'Enable'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index e542383166..2e9f9676c3 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -95,8 +95,8 @@ $lang->kanban->aclGroup['extend'] = '继承空间'; $lang->kanban->aclList['extend'] = '继承空间访问权限（能访问当前空间，即可访问）'; $lang->kanban->aclList['private'] = '私有（看板团队成员、白名单、空间负责人可访问）'; -$lang->kanban->enableArchive['0'] = '不启用'; -$lang->kanban->enableArchive['1'] = '启用'; +$lang->kanban->archiveList['0'] = '不启用'; +$lang->kanban->archiveList['1'] = '启用'; $lang->kanban->enableFinished['0'] = '不启用'; $lang->kanban->enableFinished['1'] = '启用'; diff --git a/module/kanban/view/enablearchived.html.php b/module/kanban/view/enablearchived.html.php index d86565a114..2677303ef0 100644 --- a/module/kanban/view/enablearchived.html.php +++ b/module/kanban/view/enablearchived.html.php @@ -20,7 +20,7 @@ - +
kanban->archive;?>kanban->enableArchive, $kanban->archived));?>kanban->archiveList, $kanban->archived));?>