diff --git a/db/update16.4.sql b/db/update16.4.sql index 82969492c5..32f3287cb8 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'; diff --git a/module/execution/control.php b/module/execution/control.php index f248464ce5..e869d8bf2a 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')); } } diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index ffb7494ac2..1ab18d6b40 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -82,6 +82,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;}