* Fix bug #1172.
This commit is contained in:
@@ -914,8 +914,8 @@ class bug extends control
|
||||
*/
|
||||
public function batchResolve($resolution, $resolvedBuild = '')
|
||||
{
|
||||
$bugIDList = $this->post->bugIDList ? $this->post->bugIDList : die(js::locate($this->session->bugList, 'parent'));
|
||||
$this->bug->batchResolve($bugIDList, $resolution, $resolvedBuild);
|
||||
$bugIDList = $this->post->bugIDList ? $this->post->bugIDList : die(js::locate($this->session->bugList, 'parent'));
|
||||
$bugIDList = $this->bug->batchResolve($bugIDList, $resolution, $resolvedBuild);
|
||||
if(dao::isError()) die(js::error(dao::getError()));
|
||||
foreach($bugIDList as $bugID)
|
||||
{
|
||||
|
||||
@@ -854,7 +854,11 @@ class bugModel extends model
|
||||
foreach($bugIDList as $i => $bugID)
|
||||
{
|
||||
$oldBug = $bugs[$bugID];
|
||||
if($oldBug->resolution == 'fixed' and $oldBug->resolvedBuild != $resolvedBuild) unset($bugIDList[$i]);
|
||||
if($oldBug->resolution == 'fixed')
|
||||
{
|
||||
unset($bugIDList[$i]);
|
||||
continue;
|
||||
}
|
||||
if($oldBug->status != 'active') continue;
|
||||
|
||||
$assignedTo = $oldBug->openedBy;
|
||||
@@ -891,6 +895,8 @@ class bugModel extends model
|
||||
|
||||
/* Link bug to build and release. */
|
||||
$this->linkBugToBuild($bugIDList, $resolvedBuild);
|
||||
|
||||
return $bugIDList;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user