From 6022f599a9b4eebddc4eadd5c18a802f57994476 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Thu, 27 Jan 2022 08:58:07 +0800 Subject: [PATCH 1/2] * Fix bug#19043. --- 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 7afcdeb042..bddc145cb2 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -591,7 +591,7 @@ function renderProductplanItem(item, $item) var begin = $.zui.createDate(item.begin); var end = $.zui.createDate(item.end); var today = new Date(); - var labelType = begin.getTime() <= today.getTime() && end.getTime() >= today.getTime() ? 'danger' : 'wait'; + var labelType = (item.begin <= $.zui.formatDate(today, 'yyyy-MM-dd') && item.end >= $.zui.formatDate(today, 'yyyy-MM-dd')) ? 'danger' : 'wait'; var labelTitle = $.zui.formatDate(begin, 'MM-dd') + ' ' + productplanLang.to + ' ' + $.zui.formatDate(end, 'MM-dd'); if((item.begin == '2030-01-01' || item.end == '2030-01-01')) From d9389586dbb8560644253375760407466f44e102 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Thu, 27 Jan 2022 09:09:16 +0800 Subject: [PATCH 2/2] * Fix bug#19038. --- module/kanban/js/common.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module/kanban/js/common.js b/module/kanban/js/common.js index b43b7235a7..a5710e8ed9 100644 --- a/module/kanban/js/common.js +++ b/module/kanban/js/common.js @@ -79,6 +79,9 @@ function setTargetLane(targetLaneID) */ function locateView(module, objectID) { - var dataApp = module == 'productplan' || module == 'release' ? 'product' : 'execution'; + var dataApp = 'kanban'; + if(module == 'productplan' || module == 'release') dataApp = 'product'; + if(module == 'execution') dataApp = 'execution'; + if(module == 'build') dataApp = 'project'; parent.$.apps.open(createLink(module, 'view', 'objectID=' + objectID), dataApp); }