This commit is contained in:
pengjiangxiu
2017-07-19 16:43:33 +08:00
parent 8e55b830e9
commit a0f2e4b2d6
2 changed files with 9 additions and 3 deletions
+2 -2
View File
@@ -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)
{
+7 -1
View File
@@ -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;
}
/**