From 171eb2f32eb843e5ba2c004e4f84fda9916658a1 Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Thu, 4 Nov 2021 09:46:25 +0800 Subject: [PATCH 1/3] * fix modern js syntax not work in ie11. --- module/common/view/kanban.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php index 65c13b8c6a..53e41612fe 100644 --- a/module/common/view/kanban.html.php +++ b/module/common/view/kanban.html.php @@ -431,7 +431,7 @@ $.extend($.fn.kanban.Constructor.DEFAULTS, $kanban.find('.kanban-header-col[data-type="doingProject"] > .title > .count').text(doingProjectCount || 0); $kanban.find('.kanban-header-col[data-type="doingExecution"] > .title > .count').text(doingExecutionCount || 0); }, - onCreate(kanban) + onCreate: function(kanban) { kanban.$.on('scroll', updateKanbanAffixState); updateKanbanAffixState(); From f634d5f20dd113824c90f642afcc14d6b97ea906 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Tue, 9 Nov 2021 08:59:56 +0800 Subject: [PATCH 2/3] * Finish task #43933. --- module/execution/js/kanban.js | 3 ++- module/execution/view/kanban.html.php | 1 + module/group/lang/resource.php | 2 ++ module/kanban/lang/en.php | 1 + module/kanban/lang/zh-cn.php | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 204d6504d3..583d1e1514 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -498,6 +498,7 @@ function handleFinishDrop(event) function handleSortColCards() { /* TODO: handle sort cards from column contextmenu */ + return false; } /** @@ -513,7 +514,7 @@ function createColumnMenu(options) var items = []; if(priv.canEditName) items.push({label: executionLang.editName, url: $.createLink('kanban', 'setColumn', 'col=' + col.columnID + '&executionID=' + executionID), className: 'iframe', attrs: {'data-width': '500px'}}) if(priv.canSetWIP) items.push({label: executionLang.setWIP, url: $.createLink('kanban', 'setWIP', 'col=' + col.columnID + '&executionID=' + executionID), className: 'iframe', attrs: {'data-width': '500px'}}) - items.push({label: executionLang.sortColumn, items: ['按ID倒序', '按ID顺序'], className: 'iframe', onClick: handleSortColCards}) + if(priv.canSortCards) items.push({label: executionLang.sortColumn, items: ['按ID倒序', '按ID顺序'], className: 'iframe', onClick: handleSortColCards}) return items; } diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php index 422ae7163a..1d5c5f6945 100644 --- a/module/execution/view/kanban.html.php +++ b/module/execution/view/kanban.html.php @@ -126,6 +126,7 @@ js::set('priv', 'canSetWIP' => common::hasPriv('kanban', 'setWIP'), 'canSetLane' => common::hasPriv('kanban', 'setLane'), 'canMoveLane' => common::hasPriv('kanban', 'laneMove'), + 'canSortCards' => common::hasPriv('kanban', 'cardsSort'), 'canCreateTask' => $canCreateTask, 'canBatchCreateTask' => $canBatchCreateTask, 'canCreateBug' => $canCreateBug, diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 05027ab43e..a17a839279 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -609,11 +609,13 @@ $lang->resource->kanban->setLane = 'setLane'; $lang->resource->kanban->setColumn = 'setColumn'; $lang->resource->kanban->setWIP = 'setWIP'; $lang->resource->kanban->laneMove = 'laneMove'; +$lang->resource->kanban->cardsSort = 'cardsSort'; $lang->kanban->methodOrder[5] = 'setLane'; $lang->kanban->methodOrder[10] = 'setColumn'; $lang->kanban->methodOrder[15] = 'setWIP'; $lang->kanban->methodOrder[20] = 'laneMove'; +$lang->kanban->methodOrder[25] = 'cardsSort'; /* Execution. */ $lang->resource->execution = new stdclass(); diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 7555d2a66c..2b98870d0f 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -49,6 +49,7 @@ $lang->kanban->noColumnUniqueName = 'The Kanban column name already exists.'; $lang->kanban->moveUp = 'Swimlane Up'; $lang->kanban->moveDown = 'Swimlane Down'; $lang->kanban->laneMove = 'Swimlane Sorting'; +$lang->kanban->cardsSort = 'Cards Sortting'; $lang->kanban->moreAction = 'More Action'; $lang->kanban->error = new stdclass(); diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 3bfa0eb6bb..536d21f929 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -49,6 +49,7 @@ $lang->kanban->noColumnUniqueName = '看板列名称已存在'; $lang->kanban->moveUp = '泳道上移'; $lang->kanban->moveDown = '泳道下移'; $lang->kanban->laneMove = '泳道排序'; +$lang->kanban->cardsSort = '卡片排序'; $lang->kanban->moreAction = '更多操作'; $lang->kanban->error = new stdclass(); From f9f26953aa59aefc87e4a4fee3be61f9d69ea553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Tue, 9 Nov 2021 09:10:07 +0800 Subject: [PATCH 3/3] * Adjust kanban details. --- module/common/view/kanban.html.php | 1 + module/execution/lang/en.php | 2 +- module/execution/lang/zh-cn.php | 2 +- module/project/lang/en.php | 2 +- module/project/lang/zh-cn.php | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php index 4474b236ee..cc4d7e04c7 100644 --- a/module/common/view/kanban.html.php +++ b/module/common/view/kanban.html.php @@ -401,6 +401,7 @@ $.extend($.fn.kanban.Constructor.DEFAULTS, itemRender: renderKanbanItem, useFlex: false, showCount: true, + showZeroCount: true, onRenderHeaderCol: function($col, col) { if(col.type === 'doingProject') $col.attr('data-span-text', doingText); diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index d3197134e7..5885eb6d45 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -436,7 +436,7 @@ $lang->execution->doingProject = 'Ongoing Projects'; $lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common; $lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . ' ' . $lang->execution->common; -$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . ' ' . $lang->execution->common; +$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . ' ' . $lang->execution->common . '(The recent two executions)'; $lang->execution->treeLevel = array(); $lang->execution->treeLevel['all'] = 'Expand All'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 646f2cf9e1..13bc3f3930 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -436,7 +436,7 @@ $lang->execution->doingProject = '进行中的项目'; $lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . '的' . $lang->execution->common; $lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . '的' . $lang->execution->common; $lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . '的' . $lang->execution->common; -$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . '的' . $lang->execution->common; +$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . '的' . $lang->execution->common . '(最近2期)'; $lang->execution->treeLevel = array(); $lang->execution->treeLevel['all'] = '全部展开'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 049dd9f874..26995676bb 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -161,7 +161,7 @@ $lang->project->typeList['other'] = 'Other Projects'; $lang->project->waitProjects = 'Waiting Projects'; $lang->project->doingProjects = 'Ongoing Projects'; $lang->project->doingExecutions = 'Ongoing Executions'; -$lang->project->closedProjects = 'Closed Projects'; +$lang->project->closedProjects = 'Closed Projects(The recent two projects)'; $lang->project->noProgram = 'Independent Projects'; $lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761'); diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 5456081c7e..4c83291870 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -161,7 +161,7 @@ $lang->project->typeList['other'] = '其他项目'; $lang->project->waitProjects = '未开始的项目'; $lang->project->doingProjects = '进行中的项目'; $lang->project->doingExecutions = '进行中的执行'; -$lang->project->closedProjects = '已关闭的项目'; +$lang->project->closedProjects = '已关闭的项目(最近2个)'; $lang->project->noProgram = '无项目集归属项目'; $lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');