diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php index 71380e8af9..07a2010c02 100644 --- a/module/projectrelease/control.php +++ b/module/projectrelease/control.php @@ -116,9 +116,9 @@ class projectrelease extends control } /* Get the builds that can select. */ - $builds = $this->build->getProjectBuildPairs($projectID, 0, 0, 'notrunk|withbranch'); - $releaseBuilds = $this->projectrelease->getReleaseBuilds($projectID); - foreach($releaseBuilds as $build) unset($builds[$build]); + $builds = $this->build->getProjectBuildPairs($projectID, 0, 0, 'notrunk|withbranch'); + $releasedBuilds = $this->projectrelease->getReleasedBuilds($projectID); + foreach($releasedBuilds as $build) unset($builds[$build]); unset($builds['trunk']); $this->project->setMenu($projectID); @@ -170,11 +170,11 @@ class projectrelease extends control $build = $this->build->getById($release->build); /* Get the builds that can select. */ - $builds = $this->build->getProjectBuildPairs($release->project, $release->product, $release->branch, 'notrunk|withbranch'); - $releaseBuilds = $this->projectrelease->getReleaseBuilds($release->project); - foreach($releaseBuilds as $releaseBuild) + $builds = $this->build->getProjectBuildPairs($release->project, $release->product, $release->branch, 'notrunk|withbranch'); + $releasedBuilds = $this->projectrelease->getReleasedBuilds($release->project); + foreach($releasedBuilds as $releasedBuild) { - if($releaseBuild != $build->id) unset($builds[$releaseBuild]); + if($releasedBuild != $build->id) unset($builds[$releasedBuild]); } unset($builds['trunk']); diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php index 46eb6c0aae..b157a537bc 100644 --- a/module/projectrelease/model.php +++ b/module/projectrelease/model.php @@ -79,13 +79,13 @@ class projectreleaseModel extends model } /** - * Get release builds from project. + * Get released builds from project. * * @param int $projectID * @access public * @return array */ - public function getReleaseBuilds($projectID) + public function getReleasedBuilds($projectID) { $releases = $this->dao->select('build')->from(TABLE_RELEASE) ->where('deleted')->eq(0) diff --git a/module/release/control.php b/module/release/control.php index c90635efaa..27fa02a681 100644 --- a/module/release/control.php +++ b/module/release/control.php @@ -75,9 +75,9 @@ class release extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID"))); } - $builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch, 'notrunk|withbranch', false); - $releaseBuilds = $this->release->getReleaseBuilds($productID, $branch); - foreach($releaseBuilds as $build) unset($builds[$build]); + $builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch, 'notrunk|withbranch', false); + $releasedBuilds = $this->release->getReleasedBuilds($productID, $branch); + foreach($releasedBuilds as $build) unset($builds[$build]); unset($builds['trunk']); $this->commonAction($productID, $branch); @@ -124,11 +124,11 @@ class release extends control $this->commonAction($release->product, $release->branch); $build = $this->build->getById($release->build); - $builds = $this->loadModel('build')->getProductBuildPairs($release->product, $release->branch, 'notrunk|withbranch', false); - $releaseBuilds = $this->release->getReleaseBuilds($release->product, $release->branch); - foreach($releaseBuilds as $releaseBuild) + $builds = $this->loadModel('build')->getProductBuildPairs($release->product, $release->branch, 'notrunk|withbranch', false); + $releasedBuilds = $this->release->getReleasedBuilds($release->product, $release->branch); + foreach($releasedBuilds as $releasedBuild) { - if($releaseBuild != $build->id) unset($builds[$releaseBuild]); + if($releasedBuild != $build->id) unset($builds[$releasedBuild]); } unset($builds['trunk']); diff --git a/module/release/model.php b/module/release/model.php index 6fd617dc8d..f62c26d32d 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -83,14 +83,14 @@ class releaseModel extends model } /** - * Get release builds from product. + * Get released builds from product. * * @param int $productID * @param int $branch * @access public * @return void */ - public function getReleaseBuilds($productID, $branch = 0) + public function getReleasedBuilds($productID, $branch = 0) { $releases = $this->dao->select('build')->from(TABLE_RELEASE) ->where('deleted')->eq(0)