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

21
module/bug/control.php
View File

@@ -772,18 +772,23 @@ class bug extends control
die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
}
$bug = $this->bug->getById($bugID);
$productID = $bug->product;
$bug = $this->bug->getById($bugID);
$productID = $bug->product;
$users = $this->user->getPairs('nodeleted');
$assignedTo = $bug->openedBy;
if(!isset($users[$assignedTo])) $assignedTo = $this->bug->getModuleOwner($bug->module, $productID);
$this->bug->setMenu($this->products, $productID);
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->resolve;
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->bug->resolve;
$this->view->bug = $bug;
$this->view->users = $this->user->getPairs('nodeleted', $bug->openedBy);
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID);
$this->view->actions = $this->action->getList('bug', $bugID);
$this->view->bug = $bug;
$this->view->users = $users;
$this->view->assignedTo = $assignedTo;
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID);
$this->view->actions = $this->action->getList('bug', $bugID);
$this->display();
}
@@ -1015,9 +1020,7 @@ class bug extends control
*/
public function ajaxGetModuleOwner($moduleID, $productID = 0)
{
$owner = '';
if($moduleID) $owner = $this->dao->findByID($moduleID)->from(TABLE_MODULE)->fetch('owner');
if(!$owner) $owner = $this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('QD');
$owner = $this->bug->getModuleOwner($moduleID, $productID);
die($owner);
}