From da6ed899ac6051af0e88e8be81e30f3738f9652f Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 15 Sep 2021 15:09:39 +0800 Subject: [PATCH 1/2] * Fix bug 14926 --- module/execution/js/task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/js/task.js b/module/execution/js/task.js index 032f77cbbe..013627478d 100644 --- a/module/execution/js/task.js +++ b/module/execution/js/task.js @@ -9,7 +9,7 @@ $(function() $td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60); }); - toggleFold('#projectTaskForm', unfoldTasks, executionID, 'project'); + toggleFold('#executionTaskForm', unfoldTasks, executionID, 'project'); adjustTableFooter(); $('body').on('click', '#toggleFold', adjustTableFooter); From dd00b9801a22d311d0b53de2a5b006c064c0f4d0 Mon Sep 17 00:00:00 2001 From: lichengjun Date: Wed, 15 Sep 2021 07:10:28 +0000 Subject: [PATCH 2/2] * Fix bug#15073. --- module/mr/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/mr/model.php b/module/mr/model.php index cdd895ed7e..d86e635062 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -327,7 +327,7 @@ class mrModel extends model $todo->assignedBy = $this->app->user->account; $todo->date = date("Y-m-d", strtotime($rawTodo->target->created_at)); $todo->assignedDate = $rawTodo->target->created_at; - $todo->begin = ceil(date("Hi", strtotime($rawTodo->target->created_at))/10)*10; + $todo->begin = '2400'; /* 2400 means begin is 'undefined'. */; $todo->end = '2400'; /* 2400 means end is 'undefined'. */ $todo->type = 'custom'; $todo->idvalue = $rawTodo->id;