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']);