Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #41587.

Browse Source
This commit is contained in:
tianshujie98
2021-08-20 10:19:53 +08:00
parent 9ba8cc1f57
commit d5a6e92d98
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/projectrelease/control.php
+7 -7
View File
@@ -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']);
module/projectrelease/model.php
+2 -2
View File
@@ -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)
module/release/control.php
+7 -7
View File
@@ -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']);
module/release/model.php
+2 -2
View File
@@ -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)