From 2fa11c196e37ec9e1f68c8f2dfb050dff0856d1c Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Thu, 1 Sep 2022 13:31:51 +0800 Subject: [PATCH 1/3] * Fix bug #27041. --- module/repo/control.php | 1 + module/task/model.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/module/repo/control.php b/module/repo/control.php index 9eb502a03e..c0ea44aaba 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -302,6 +302,7 @@ class repo extends control $this->view->file = $file; $this->view->entry = $entry; $this->view->path = $entry; + $this->view->info = $info; $this->view->suffix = $suffix; $this->view->content = $content ? $content : ''; $this->view->pathInfo = $pathInfo; diff --git a/module/task/model.php b/module/task/model.php index e6e3499c11..58705bfc4e 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1745,8 +1745,10 @@ class taskModel extends model foreach($record->dates as $id => $item) if($item > $today) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->date; if(dao::isError()) return false; + $task = $this->getById($taskID); + if(!empty($task->team) and !isset($task->team[$this->app->user->account])) return false; + $estimates = array(); - $task = $this->getById($taskID); $earliestTime = ''; foreach(array_keys($record->id) as $id) { From 016ded0c2c172d667f4495f8d04cbc67b78dc9d3 Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Thu, 1 Sep 2022 14:05:32 +0800 Subject: [PATCH 2/3] * Fix bug #27032. --- module/repo/css/ajaxgetrelationinfo.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/repo/css/ajaxgetrelationinfo.css b/module/repo/css/ajaxgetrelationinfo.css index 6aaa44e68c..4419481fdf 100644 --- a/module/repo/css/ajaxgetrelationinfo.css +++ b/module/repo/css/ajaxgetrelationinfo.css @@ -1,6 +1,7 @@ body {background-color: #fff; padding-bottom: 20px;} .linkContent .panel {margin-bottom: 0; padding-bottom: 10px; border: none;} -.left-content {border-right: 1px solid #EDEEF2; padding-top: 15px;} +.left-content {padding-top: 15px;} +.right-content {border-left: 1px solid #EDEEF2; padding-top: 15px;} .text {width: 85%; white-space: normal; word-wrap: break-word; word-break: break-all; font-weight: normal; padding-left: 10px;} .cell {min-height: 300px;} .menu-title {width: 100%;} From bf01d4b3eb2e4085acef3452dbbacb614b41ebce Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Thu, 1 Sep 2022 14:43:31 +0800 Subject: [PATCH 3/3] * Fix bug #27032. --- module/repo/view/ajaxgetrelationinfo.html.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/repo/view/ajaxgetrelationinfo.html.php b/module/repo/view/ajaxgetrelationinfo.html.php index 3b09027daa..a4c28db445 100644 --- a/module/repo/view/ajaxgetrelationinfo.html.php +++ b/module/repo/view/ajaxgetrelationinfo.html.php @@ -41,7 +41,11 @@ include '../../common/view/header.lite.html.php';