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

* finish the task #655 and #639 ang fix the bug #277.

Browse Source
This commit is contained in:
shiyangyangwork@yahoo.cn
2011-12-14 08:56:06 +00:00
parent 017192c8ad
commit 30a1bee9a4
9 changed files with 49 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+3 -13
View File
@@ -570,24 +570,15 @@ class bug extends control
* @access public
* @return void
*/
public function resolve($bugID, $toStory = false)
public function resolve($bugID)
{
$this->view->users = $this->user->getPairs('nodeleted');
if(!empty($_POST))
{
$storyID = $this->bug->resolve($bugID);
$this->bug->resolve($bugID);
if(dao::isError()) die(js::error(dao::getError()));
if($this->post->resolution == 'tostory')
{
$actionID = $this->action->create('bug', $bugID, 'ToStory', $this->post->comment, $storyID);
$this->action->create('bug', $bugID, 'Closed');
}
else
{
$actionID = $this->action->create('bug', $bugID, 'Resolved', $this->post->comment, $this->post->resolution);
}
$actionID = $this->action->create('bug', $bugID, 'Resolved', $this->post->comment, $this->post->resolution);
$this->sendmail($bugID, $actionID);
$bug = $this->bug->getById($bugID);
@@ -606,7 +597,6 @@ class bug extends control
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->bug->resolve;
$this->view->toStory = $toStory;
$this->view->bug = $bug;
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID);
$this->view->actions = $this->action->getList('bug', $bugID);