From 67dd183b10ea4951187f39d736203a5f5e56105f Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 8 Feb 2021 14:21:15 +0800 Subject: [PATCH 1/4] * Fix bug #10966. --- module/task/model.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/task/model.php b/module/task/model.php index ea93fd4fdc..8958a2cc6e 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1040,6 +1040,8 @@ class taskModel extends model if($data->finishedBys[$taskID] == 'ditto') $data->finishedBys[$taskID] = isset($prev['finishedBy']) ? $prev['finishedBy'] : ''; if($data->canceledBys[$taskID] == 'ditto') $data->canceledBys[$taskID] = isset($prev['canceledBy']) ? $prev['canceledBy'] : ''; if($data->closedBys[$taskID] == 'ditto') $data->closedBys[$taskID] = isset($prev['closedBy']) ? $prev['closedBy'] : ''; + if($data->estStarteds[$taskID] == '0000-00-00') $data->estStarteds[$taskID] = ''; + if($data->deadlines[$taskID] == '0000-00-00') $data->deadlines[$taskID] = ''; $prev['module'] = $data->modules[$taskID]; $prev['type'] = $data->types[$taskID]; From 5b69333ed15c7ed2327a72135e715a3c32587aa7 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 8 Feb 2021 15:20:54 +0800 Subject: [PATCH 2/4] * Fix bug. --- zdata/create.php | 1 + 1 file changed, 1 insertion(+) diff --git a/zdata/create.php b/zdata/create.php index ed262e003b..a2b06da6d2 100644 --- a/zdata/create.php +++ b/zdata/create.php @@ -48,6 +48,7 @@ try $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); // 设置报错处理方式。 $dbh->exec("SET GLOBAL sql_mode = '';"); + $dbh->exec("set names 'utf8'"); $dbh->beginTransaction(); foreach($sqlFilePath as $file) From 166f48a297b6cb454c51ce5f35d5e0b304036093 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 8 Feb 2021 17:01:10 +0800 Subject: [PATCH 3/4] * Delete duplicate code. --- module/projectrelease/control.php | 4 ++-- module/projectrelease/model.php | 22 ---------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php index 84472eceb9..d756dc1aa7 100644 --- a/module/projectrelease/control.php +++ b/module/projectrelease/control.php @@ -495,8 +495,8 @@ class projectrelease extends control */ public function batchUnlinkStory($releaseID) { - $this->projectrelease->batchUnlinkStory($releaseID); - die(js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=story"), 'parent')); + $this->loadModel('release')->batchUnlinkStory($releaseID); + die(js::locate($this->createLink('projectrelease', 'view', "releaseID=$releaseID&type=story"), 'parent')); } /** diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php index 25fb125d56..17e66dfb1a 100644 --- a/module/projectrelease/model.php +++ b/module/projectrelease/model.php @@ -292,28 +292,6 @@ class projectreleaseModel extends model $this->loadModel('action')->create('story', $storyID, 'unlinkedfromrelease', '', $releaseID); } - /** - * Batch unlink story. - * - * @param int $releaseID - * @access public - * @return void - */ - public function batchUnlinkStory($releaseID) - { - $storyList = $this->post->storyIdList; - if(empty($storyList)) return true; - - $release = $this->getByID($releaseID); - $release->stories = ",$release->stories,"; - foreach($storyList as $storyID) $release->stories = str_replace(",$storyID,", ',', $release->stories); - $release->stories = trim($release->stories, ','); - $this->dao->update(TABLE_RELEASE)->set('stories')->eq($release->stories)->where('id')->eq((int)$releaseID)->exec(); - - $this->loadModel('action'); - foreach($this->post->storyIdList as $unlinkStoryID) $this->action->create('story', $unlinkStoryID, 'unlinkedfromrelease', '', $releaseID); - } - /** * Link bugs. * From 440d8f440e144fbf0b044ee951ffdaa7b3457d65 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 8 Feb 2021 17:09:11 +0800 Subject: [PATCH 4/4] * Delete duplicate code. --- module/projectrelease/control.php | 4 ++-- module/projectrelease/model.php | 25 ------------------------- module/release/model.php | 1 - 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php index d756dc1aa7..0b9e74304b 100644 --- a/module/projectrelease/control.php +++ b/module/projectrelease/control.php @@ -626,8 +626,8 @@ class projectrelease extends control */ public function batchUnlinkBug($releaseID, $type = 'bug') { - $this->projectrelease->batchUnlinkBug($releaseID, $type); - die(js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=$type"), 'parent')); + $this->loadModel('release')->batchUnlinkBug($releaseID, $type); + die(js::locate($this->createLink('projectrelease', 'view', "releaseID=$releaseID&type=$type"), 'parent')); } /** diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php index 17e66dfb1a..764f567503 100644 --- a/module/projectrelease/model.php +++ b/module/projectrelease/model.php @@ -336,31 +336,6 @@ class projectreleaseModel extends model $this->loadModel('action')->create('bug', $bugID, 'unlinkedfromrelease', '', $releaseID); } - /** - * Batch unlink bug. - * - * @param int $releaseID - * @param string $type - * @access public - * @return void - */ - public function batchUnlinkBug($releaseID, $type = 'bug') - { - - $bugList = $this->post->unlinkBugs; - if(empty($bugList)) return true; - - $release = $this->getByID($releaseID); - $field = $type == 'bug' ? 'bugs' : 'leftBugs'; - $release->$field = ",{$release->$field},"; - foreach($bugList as $bugID) $release->$field = str_replace(",$bugID,", ',', $release->$field); - $release->$field = trim($release->$field, ','); - $this->dao->update(TABLE_RELEASE)->set($field)->eq($release->$field)->where('id')->eq((int)$releaseID)->exec(); - - $this->loadModel('action'); - foreach($this->post->unlinkBugs as $unlinkBugID) $this->action->create('bug', $unlinkBugID, 'unlinkedfromrelease', '', $releaseID); - } - /** * Change status. * diff --git a/module/release/model.php b/module/release/model.php index ab21ea820c..89f0562ac3 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -360,7 +360,6 @@ class releaseModel extends model */ public function batchUnlinkBug($releaseID, $type = 'bug') { - $bugList = $this->post->unlinkBugs; if(empty($bugList)) return true;