From 60e271f10a0d962e982c4c4d16c020509b808bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= Date: Mon, 14 Mar 2022 15:31:29 +0800 Subject: [PATCH 1/2] *fix bug#17639 --- module/project/model.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index ab6fccf531..ba036446c9 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1528,11 +1528,6 @@ class projectModel extends model extract($data); $projectID = (int)$projectID; $projectType = 'project'; - $accounts = array_unique($accounts); - $limited = array_values($limited); - $roles = array_values($roles); - $days = array_values($days); - $hours = array_values($hours); $oldJoin = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->fetchPairs(); $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->exec(); @@ -1545,7 +1540,7 @@ class projectModel extends model $member->role = $roles[$key]; $member->days = $days[$key]; $member->hours = $hours[$key]; - $member->limited = $limited[$key]; + $member->limited = isset($limited[$key]) ? $limited[$key] : 'no'; $member->root = $projectID; $member->account = $account; From 951a3ab1afabdb331bae84e5b528f7746a7e0107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= Date: Mon, 14 Mar 2022 16:26:45 +0800 Subject: [PATCH 2/2] *Fix bug#17639 --- module/project/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/project/model.php b/module/project/model.php index ba036446c9..36bb0174a5 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1528,6 +1528,7 @@ class projectModel extends model extract($data); $projectID = (int)$projectID; $projectType = 'project'; + $accounts = array_unique($accounts); $oldJoin = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->fetchPairs(); $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->exec();