Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

This commit is contained in:
wangyidong
2021-04-02 14:07:24 +08:00
59 changed files with 505 additions and 375 deletions
+6 -3
View File
@@ -1098,11 +1098,12 @@ class bug extends control
/**
* Batch update assign of bug.
*
* @param int $executionID
* @param int $objectID projectID|executionID
* @param string $type execution|project|product|my
* @access public
* @return void
*/
public function batchAssignTo($executionID, $type = 'execution')
public function batchAssignTo($objectID, $type = 'execution')
{
if(!empty($_POST) && isset($_POST['bugIDList']))
{
@@ -1119,8 +1120,10 @@ class bug extends control
}
$this->loadModel('score')->create('ajax', 'batchOther');
}
if($type == 'product' || $type == 'my') die(js::locate($this->session->bugList, 'parent'));
die(js::locate($this->createLink('execution', 'bug', "executionID=$executionID")));
if($type == 'execution') die(js::locate($this->createLink('execution', 'bug', "executionID=$objectID")));
if($type == 'project') die(js::locate($this->createLink('project', 'bug', "projectID=$objectID")));
}
/**