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

* Compatible extension if there is a object to transfer bug.

Browse Source
This commit is contained in:
daitingting
2018-03-29 16:56:22 +08:00
parent a45b147781
commit 0c9e7a58ff
2 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+47 -4
View File
@@ -222,8 +222,34 @@ class bug extends control
*/
public function create($productID, $branch = '', $extras = '')
{
$this->view->users = $this->user->getPairs('devfirst|noclosed|nodeleted');
if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
/* Whether there is a object to transfer bug, for example feedback. */
$extras = str_replace(array(',', ' '), array('&', ''), $extras);
parse_str($extras, $output);
foreach($output as $paramKey => $paramValue)
{
if(isset($this->config->bug->fromObjects[$paramKey]))
{
$fromObjectIDKey = $paramKey;
$fromObjectID = $paramValue;
$fromObjectName = $this->config->bug->fromObjects[$fromObjectIDKey]['name'];
$fromObjectAction = $this->config->bug->fromObjects[$fromObjectIDKey]['action'];
break;
}
}
/* If there is a object to transfer bug, get it by getById function and set objectID,object in views. */
if(isset($fromObjectID))
{
$fromObject = $this->loadModel($fromObjectName)->getById($fromObjectID);
if(!$fromObject) die(js::error($this->lang->notFound) . js::locate('back', 'parent'));
$this->view->$fromObjectIDKey = $fromObjectID;
$this->view->$fromObjectName = $fromObject;
}
$this->view->users = $this->user->getPairs('devfirst|noclosed|nodeleted');
$this->app->loadLang('release');
if(!empty($_POST) and !isset($_POST['stepIDList']))
@@ -231,7 +257,8 @@ class bug extends control
$response['result'] = 'success';
$response['message'] = '';
$bugResult = $this->bug->create();
/* Set from param if there is a object to transfer bug. */
$bugResult = $this->bug->create($from = isset($fromObjectIDKey) ? $fromObjectIDKey : '');
if(!$bugResult or dao::isError())
{
$response['result'] = 'fail';
@@ -247,7 +274,15 @@ class bug extends control
$this->send($response);
}
$actionID = $this->action->create('bug', $bugID, 'Opened');
/* Record related action, for example FromFeedback. */
if(isset($fromObjectID))
{
$actionID = $this->action->create('bug', $bugID, $fromObjectAction, '', $fromObjectID);
}
else
{
$actionID = $this->action->create('bug', $bugID, 'Opened');
}
$extras = str_replace(array(',', ' '), array('&', ''), $extras);
parse_str($extras, $output);
@@ -316,11 +351,19 @@ class bug extends control
}
if(isset($todoID))
{
$todo = $this->loadModel('todo')->getById($todoID);
$todo = $this->loadModel('todo')->getById($todoID);
$title = $todo->name;
$steps = $todo->desc;
$pri = $todo->pri;
}
/* Replace the value of bug that needs to be replaced with the value of the object that is transferred to bug. */
if(isset($fromObject))
{
foreach($this->config->bug->fromObjects[$fromObjectIDKey]['fields'] as $bugField => $fromObjectField)
{
$$bugField = $fromObject->{$fromObjectField};
}
}
/* If projectID is setted, get builds and stories of this project. */
if($projectID)
module/bug/model.php
+6 -1
View File
@@ -53,10 +53,11 @@ class bugModel extends model
/**
* Create a bug.
*
* @param string $from object that is transfered to bug.
* @access public
* @return int|bool
*/
public function create()
public function create($from = '')
{
$now = helper::now();
$bug = fixer::input('post')
@@ -87,6 +88,10 @@ class bugModel extends model
$this->file->updateObjectID($this->post->uid, $bugID, 'bug');
$this->file->saveUpload('bug', $bugID);
empty($bug->case) ? $this->loadModel('score')->create('bug', 'create', $bugID) : $this->loadModel('score')->create('bug', 'createFormCase', $bug->case);
/* Callback the callable method to process the related data for object that is transfered to bug. */
if(is_callable(array($this, $this->config->bug->fromObjects[$from]['callback']))) call_user_func(array($this, $this->config->bug->fromObjects[$from]['callback']), $bugID);
return array('status' => 'created', 'id' => $bugID);
}
return false;