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

* finish task #2317.

Browse Source
This commit is contained in:
wangyidong
2015-08-27 14:49:33 +08:00
parent 7bb9a3f923
commit 09ecfa30dd
4 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+65 -1
View File
@@ -340,6 +340,43 @@ class bugModel extends model
->fetchAll();
}
/**
* Get module owner.
*
* @param int $moduleID
* @param int $productID
* @access public
* @return string
*/
public function getModuleOwner($moduleID, $productID)
{
$users = $this->loadModel('user')->getPairs('nodeleted');
if($moduleID)
{
$module = $this->dao->findByID($moduleID)->from(TABLE_MODULE)->fetch();
if($module->owner and isset($users[$module->owner])) return $module->owner;
$moduleIDList = explode(',', trim(str_replace(",$module->id,", ',', $module->path), ','));
krsort($moduleIDList);
if($moduleIDList)
{
$modules = $this->dao->select('*')->from(TABLE_MODULE)->where('id')->in($moduleIDList)->fetchAll('id');
foreach($moduleIDList as $moduleID)
{
if(isset($modules[$moduleID]))
{
$module = $modules[$moduleID];
if($module->owner and isset($users[$module->owner])) return $module->owner;
}
}
}
}
$owner = $this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('QD');
return isset($users[$owner]) ? $users[$owner] : '';
}
/**
* Update a bug.
*
@@ -598,10 +635,37 @@ class bugModel extends model
{
$now = helper::now();
$bugs = $this->getByList($bugIDList);
$bug = reset($bugs);
$productID = $bug->product;
$users = $this->loadModel('user')->getPairs('nodeleted');
$product = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch();
$stmt = $this->dao->query($this->loadModel('tree')->buildMenuQuery($productID, 'bug', ''));
$modules = array();
while($module = $stmt->fetch()) $modules[$module->id] = $module;
foreach($bugIDList as $bugID)
{
$oldBug = $bugs[$bugID];
if($oldBug->status != 'active') continue;
$assignedTo = $oldBug->openedBy;
if(!isset($users[$assignedTo]))
{
$assignedTo = '';
$module = isset($modules[$oldBug->module]) ? $modules[$oldBug->module] : '';
while($module)
{
if($module->owner and isset($users[$module->owner]))
{
$assignedTo = $module->owner;
break;
}
$module = isset($modules[$module->parent]) ? $modules[$module->parent] : '';
}
if(empty($assignedTo)) $assignedTo = $product->QD;
}
$bug = new stdClass();
$bug->resolution = $resolution;
$bug->resolvedBuild = $resolution == 'fixed' ? $resolvedBuild : '';
@@ -609,7 +673,7 @@ class bugModel extends model
$bug->resolvedDate = $now;
$bug->status = 'resolved';
$bug->confirmed = 1;
$bug->assignedTo = $oldBug->openedBy;
$bug->assignedTo = $assignedTo;
$bug->assignedDate = $now;
$bug->lastEditedBy = $this->app->user->account;
$bug->lastEditedDate = $now;