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

* Optimize responseAfterOperate function.

Browse Source
This commit is contained in:
wangyuting
2023-05-31 14:36:22 +08:00
parent d79b0a662d
commit 68e0ea507a
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+10 -5
View File
@@ -293,7 +293,8 @@ class bug extends control
}
/* Get response after editing bug. */
return $this->bugZen->responseAfterOperate($bugID, $changes, $kanbanGroup);
$message = $this->executeHooks($bugID);
return $this->bugZen->responseAfterOperate($bugID, $changes, $kanbanGroup, 0, $message);
}
$this->bugZen->checkBugExecutionPriv($oldBug);
@@ -385,8 +386,9 @@ class bug extends control
$this->bug->confirm($bug, $kanbanData);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$message = $this->executeHooks($bugID);
$regionID = zget($kanbanData, 'regionID', 0);
return $this->bugZen->responseAfterOperate($bugID, array(), '', $regionID);
return $this->bugZen->responseAfterOperate($bugID, array(), '', $regionID, $message);
}
$this->qa->setMenu($this->products, $oldBug->product, $oldBug->branch);
@@ -436,8 +438,9 @@ class bug extends control
if($oldBug->status != 'closed') $this->bug->resolve($bug, $output);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$message = $this->executeHooks($bugID);
$regionID = zget($output, 'regionID', 0);
return $this->bugZen->responseAfterOperate($bugID, array(), '', $regionID);
return $this->bugZen->responseAfterOperate($bugID, array(), '', $regionID, $message);
}
/* Remove 'Convert to story' from the solution list. */
@@ -488,8 +491,9 @@ class bug extends control
$this->bug->activate($bug, $kanbanParams);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$message = $this->executeHooks($bugID);
$regionID = zget($kanbanParams, 'regionID', 0);
return $this->bugZen->responseAfterOperate($bugID, array(), '', $regionID);
return $this->bugZen->responseAfterOperate($bugID, array(), '', $regionID, $message);
}
$productID = $oldBug->product;
@@ -528,8 +532,9 @@ class bug extends control
$this->bug->close($bug, $output);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$message = $this->executeHooks($bugID);
$regionID = zget($output, 'regionID', 0);
return $this->bugZen->responseAfterOperate($bugID, array(), '', $regionID);
return $this->bugZen->responseAfterOperate($bugID, array(), '', $regionID, $message);
}
$this->view->bug = $oldBug;