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

* Finish Task #78665.

Browse Source
This commit is contained in:
liuhong
2022-12-08 06:55:05 +00:00
parent 8ad99f03a5
commit 0094f902f5
7 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
module/build/control.php
View File

@@ -144,6 +144,8 @@ class build extends control
$changes = $this->build->update($buildID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$files = $this->loadModel('file')->saveUpload('build', $buildID);
$change[$buildID] = $changes;
$this->unlinkOldBranch($change);
if($changes or $files)
{
@@ -716,7 +718,7 @@ class build extends control
$buildStories = $this->loadModel('story')->getByList($build->allStories);
$buildBugs = $this->loadModel('bug')->getByList($build->allBugs);
$branchPairs = $this->loadModel('branch')->getPairs($build->product);
$this->app->loadLang('branc');
$this->app->loadLang('branch');
$removeBranches = '';
foreach(explode(',', $oldBranch) as $oldBranchID)
@@ -771,6 +773,46 @@ class build extends control
return print(js::locate($this->createLink('build', 'view', "buildID=$buildID&type=story"), 'parent'));
}
/**
* Unlink story and bug when edit branch of build.
* @param int $buildID
* @param int $oldBranch
* @access protected
* @return void
*/
protected function unlinkOldBranch($changes)
{
foreach($changes as $buildID => $changes)
{
$oldBranch = '';
$newBranch = '';
foreach($changes as $changeId => $change)
{
if($change['field'] == 'branch')
{
$oldBranch = $change['old'];
$newBranch = $change['new'];
break;
}
}
$build = $this->build->getByID($buildID);
$planStories = $this->loadModel('story')->getByList($build->allStories);
$planBugs = $this->loadModel('bug')->getByList($build->allBugs);
if($oldBranch)
{
foreach($planStories as $storyID => $story)
{
if($story->branch and strpos(",$newBranch,", ",$story->branch,") === false) $this->build->unlinkStory($storyID, $buildID);
}
foreach($planBugs as $bugID => $bug)
{
if($bug->branch and strpos(",$newBranch,", ",$bug->branch,") === false) $this->build->unlinkBug($bugID, $buildID);
}
}
}
}
/**
* Link bugs.
*