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] * 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;