From 1622aa31fb2a33ab7a7bfa7bc3b3822d98e769a8 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 18 Mar 2022 14:15:08 +0800 Subject: [PATCH 1/4] * Fix bug #20910. --- module/kanban/js/view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index bf5a191c4e..f31b6fefee 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -1504,7 +1504,7 @@ function initSortable() var groupID = e.element.closest('.kanban-board').data('id'); e.list.each(function(index, data) { - if(data.item.hasClass('kanban-col') && data.item.hasClass('sort') && groupID == data.item.data().col.group) orders.push(data.item.data('id')); + if(data.item.hasClass('kanban-col') && (data.item.hasClass('sort')|| data.item.children().hasClass('sort')) && groupID == data.item.data().col.group) orders.push(data.item.data('id')); }); regionID = e.element.closest('.region').data('id'); From c97329fa3798d1cfa1b4b928f8c534b9fcdbaf6e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 18 Mar 2022 14:27:25 +0800 Subject: [PATCH 2/4] * Fix bug #19296. --- module/kanban/css/splitcolumn.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/kanban/css/splitcolumn.css b/module/kanban/css/splitcolumn.css index 255e174fbf..63fba87063 100644 --- a/module/kanban/css/splitcolumn.css +++ b/module/kanban/css/splitcolumn.css @@ -2,6 +2,7 @@ .c-WIPTitle {width: 80px; padding-left: 15px !important; padding-right: 0px !important;} .c-color {width: 320px;} .c-WIPCount {width: 240px;} +.c-WIPTitle {width: 85px;} td.required:after {right: -1px;} .c-action {width: 80px;} .c-action > a {padding-top: 10px;} From 34c8489218c9321624af8846cb11b35fb7d61a84 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 18 Mar 2022 15:20:59 +0800 Subject: [PATCH 3/4] * Fix pending review issues. --- module/my/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/my/control.php b/module/my/control.php index 95d130dc23..8c8257062f 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -170,7 +170,7 @@ class my extends control $riskCount = $pager->recTotal; /* Get the number of reviews assigned to me. */ - $reviewList = $this->review->getUserReviews('wait', 'id_desc', $pager); + $reviewList = $this->review->getUserReviews('needreview', 'id_desc', $pager); $reviewCount = $pager->recTotal; /* Get the number of nc assigned to me. */ @@ -803,7 +803,7 @@ EOF; * @access public * @return void */ - public function audit($browseType = 'wait', $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1) + public function audit($browseType = 'needreview', $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1) { $this->loadModel('datatable'); $this->loadModel('baseline'); From fb3f55efd5f1d3686094c088ce540feb1e2ce896 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 18 Mar 2022 15:29:39 +0800 Subject: [PATCH 4/4] * Add spaces. --- module/kanban/js/view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index f31b6fefee..9f581a4bc4 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -1504,7 +1504,7 @@ function initSortable() var groupID = e.element.closest('.kanban-board').data('id'); e.list.each(function(index, data) { - if(data.item.hasClass('kanban-col') && (data.item.hasClass('sort')|| data.item.children().hasClass('sort')) && groupID == data.item.data().col.group) orders.push(data.item.data('id')); + if(data.item.hasClass('kanban-col') && (data.item.hasClass('sort') || data.item.children().hasClass('sort')) && groupID == data.item.data().col.group) orders.push(data.item.data('id')); }); regionID = e.element.closest('.region').data('id');