From 068784e472ba1ab0710f57b7294fa58f585397ba Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 16 Mar 2023 02:17:48 +0000 Subject: [PATCH 1/2] * Fix bug #32954. --- module/execution/model.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index 3c3ee37b8d..9218e4c1a9 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -5684,12 +5684,13 @@ class executionModel extends model */ public function generateRow($executions, $users, $productID) { - $rows = array(); + $today = helper::today(); + $rows = array(); foreach($executions as $id => $execution) { $label = $execution->type == 'stage' ? 'label-warning' : 'label-info'; $link = $execution->type == 'kanban' ? helper::createLink('execution', 'kanban', "id=$execution->id") : helper::createLink('execution', 'task', "id=$execution->id"); - $execution->name = "{$this->lang->execution->typeList[$execution->type]} " . (empty($execution->children) ? html::a($link, $execution->name) : $execution->name); + $execution->name = "{$this->lang->execution->typeList[$execution->type]} " . (empty($execution->children) ? html::a($link, $execution->name) : $execution->name) . (strtotime($today) > strtotime($execution->end) ? '' . $this->lang->execution->delayed . '' : '');; $execution->project = $execution->projectName; $execution->parent = ($execution->parent and $execution->grade > 1) ? $execution->parent : ''; $execution->asParent = !empty($execution->children); From 6c9f1435a0b779c89ec475872350fd5d178ceca5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 16 Mar 2023 02:32:00 +0000 Subject: [PATCH 2/2] * Fix bug #32992. --- module/execution/css/view.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/css/view.css b/module/execution/css/view.css index ade5431e42..5be4918dab 100644 --- a/module/execution/css/view.css +++ b/module/execution/css/view.css @@ -27,5 +27,5 @@ #cfdChart {margin-top: -20px;} -#triggerModal .modal-dialog {top: 15% !important; overflow-y: auto; max-height: 80%;} +#triggerModal .modal-dialog {top: 15% !important; max-height: 80%;} #triggerModal .modal-dialog::-webkit-scrollbar-track {background-color: white;}