From f9be4ab1ba1b109feea73d23114e21c099c2ae1b Mon Sep 17 00:00:00 2001 From: mayue Date: Mon, 14 Mar 2022 15:16:06 +0800 Subject: [PATCH 1/3] * Fix bug#20646. --- module/kanban/css/view.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index 8296944382..7d024d32c0 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -81,6 +81,7 @@ .kanban-item .has-color .info > .user .lable-teamSumCount, .kanban-item .has-color .info > .label-light {color: #FFFFFF;} .kanban-item .has-color .info > .label-pri {border-color: #FFFFFF;} +.kanban-item .has-color .progress-box > .progress-number {color: #FFFFFF;} .kanban-item .item-more {position: absolute; right: 6px; top: 0px;} .kanban-card {height: auto !important; padding: 8px 14px !important; min-height: 60px;} From 5c3395ee462ebee6381eaddce2f292b0c307b671 Mon Sep 17 00:00:00 2001 From: mayue Date: Mon, 14 Mar 2022 16:17:51 +0800 Subject: [PATCH 2/3] * Fix bug #20645. --- db/update16.4.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/update16.4.sql b/db/update16.4.sql index 4b71467972..d5dfcca3c5 100644 --- a/db/update16.4.sql +++ b/db/update16.4.sql @@ -23,6 +23,7 @@ ALTER TABLE `zt_story` ADD `activatedDate` datetime NOT NULL AFTER `closedReason ALTER TABLE `zt_task` MODIFY `activatedDate` datetime NOT NULL AFTER `lastEditedDate`; ALTER TABLE `zt_kanbancard` ADD `progress` float unsigned NOT NULL DEFAULT '0' AFTER `estimate`; +UPDATE `zt_kanbancard` SET `progress`='100' WHERE `status` = 'done' and `fromtype` = ''; ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL DEFAULT 'rnd,lite' AFTER `visits`; UPDATE `zt_user` SET `visions`='rnd,lite'; From d74e5c4c58a5cb03691276ec61f62167132abafc Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Tue, 22 Mar 2022 09:58:43 +0800 Subject: [PATCH 3/3] * Fix bug #15984. --- module/execution/control.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index 964df20efa..3bb6498b46 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2895,11 +2895,7 @@ class execution extends control $this->execution->unlinkStory($executionID, $storyID); /* if kanban then reload and if ajax request then send result. */ - if(isonlybody()) - { - return print(js::reload('parent')); - } - elseif(helper::isAjaxRequest()) + if(helper::isAjaxRequest()) { if(dao::isError()) { @@ -2913,7 +2909,7 @@ class execution extends control } return $this->send($response); } - return print(js::locate($this->app->session->storyList, 'parent')); + return print(js::reload('parent')); } }