Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
@@ -78,6 +78,7 @@ class bugModel extends model
|
||||
$data = fixer::input('post')->get();
|
||||
$actions = array();
|
||||
|
||||
/* Get pairs(moduleID => moduleOwner) for bug. */
|
||||
$stmt = $this->dbh->query($this->loadModel('tree')->buildMenuQuery($productID, 'bug', $startModuleID = 0));
|
||||
$moduleOwners = array();
|
||||
while($module = $stmt->fetch()) $moduleOwners[$module->id] = $module->owner;
|
||||
@@ -201,7 +202,7 @@ class bugModel extends model
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function getList($bugIDList = 0)
|
||||
public function getByList($bugIDList = 0)
|
||||
{
|
||||
return $this->dao->select('*')->from(TABLE_BUG)
|
||||
->where('deleted')->eq(0)
|
||||
@@ -422,7 +423,7 @@ class bugModel extends model
|
||||
public function batchConfirm($bugIDList)
|
||||
{
|
||||
$now = helper::now();
|
||||
$bugs = $this->getList($bugIDList);
|
||||
$bugs = $this->getByList($bugIDList);
|
||||
foreach($bugIDList as $bugID)
|
||||
{
|
||||
if($bugs[$bugID]->confirmed) continue;
|
||||
@@ -482,7 +483,7 @@ class bugModel extends model
|
||||
public function batchResolve($bugIDList, $resolution, $resolvedBuild)
|
||||
{
|
||||
$now = helper::now();
|
||||
$bugs = $this->getList($bugIDList);
|
||||
$bugs = $this->getByList($bugIDList);
|
||||
foreach($bugIDList as $bugID)
|
||||
{
|
||||
$oldBug = $bugs[$bugID];
|
||||
|
||||
Reference in New Issue
Block a user