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 story.

Browse Source
This commit is contained in:
daitingting
2018-03-30 10:48:16 +08:00
parent ad7cfe467e
commit 070454933b
2 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+58 -4
View File
@@ -38,17 +38,43 @@ class story extends control
* @param int $bugID
* @param int $planID
* @param int $todoID
* @param string $extra for example feedbackID=0
* @access public
* @return void
*/
public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $projectID = 0, $bugID = 0, $planID = 0, $todoID = 0)
public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $projectID = 0, $bugID = 0, $planID = 0, $todoID = 0, $extra = '')
{
/* Whether there is a object to transfer story, for example feedback. */
$extra = str_replace(array(',', ' '), array('&', ''), $extra);
parse_str($extra, $output);
foreach($output as $paramKey => $paramValue)
{
if(isset($this->config->story->fromObjects[$paramKey]))
{
$fromObjectIDKey = $paramKey;
$fromObjectID = $paramValue;
$fromObjectName = $this->config->story->fromObjects[$fromObjectIDKey]['name'];
$fromObjectAction = $this->config->story->fromObjects[$fromObjectIDKey]['action'];
break;
}
}
/* If there is a object to transfer story, 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;
}
if(!empty($_POST))
{
$response['result'] = 'success';
$response['message'] = '';
$storyResult = $this->story->create($projectID, $bugID);
$storyResult = $this->story->create($projectID, $bugID, $from = isset($fromObjectIDKey) ? $fromObjectIDKey : '');
if(!$storyResult or dao::isError())
{
$response['result'] = 'fail';
@@ -71,8 +97,14 @@ class story extends control
$this->send($response);
}
$action = $bugID == 0 ? 'Opened' : 'Frombug';
$extra = $bugID == 0 ? '' : $bugID;
$action = $bugID == 0 ? 'Opened' : 'Frombug';
$extra = $bugID == 0 ? '' : $bugID;
/* Record related action, for example FromFeedback. */
if($fromObjectID)
{
$action = $fromObjectAction;
$extra = $fromObjectID;
}
$actionID = $this->action->create('story', $storyID, $action, '', $extra);
if($todoID > 0)
@@ -171,6 +203,28 @@ class story extends control
$pri = $todo->pri;
}
/* Replace the value of story that needs to be replaced with the value of the object that is transferred to story. */
if(isset($fromObject))
{
if(isset($this->config->story->fromObjects[$fromObjectIDKey]['source']))
{
$sourceField = $this->config->story->fromObjects[$fromObjectIDKey]['source'];
$sourceUser = $this->loadModel('user')->getById($fromObject->{$sourceField});
$source = $sourceUser->role;
$sourceNote = $sourceUser->realname;
}
else
{
$source = $fromObjectName;
$sourceNote = $fromObjectID;
}
foreach($this->config->story->fromObjects[$fromObjectIDKey]['fields'] as $storyField => $fromObjectField)
{
$$storyField = $fromObject->{$fromObjectField};
}
}
/* Set Custom*/
foreach(explode(',', $this->config->story->list->customCreateFields) as $field) $customFields[$field] = $this->lang->story->$field;
$this->view->customFields = $customFields;
module/story/model.php
+5 -1
View File
@@ -140,7 +140,7 @@ class storyModel extends model
* @access public
* @return int|bool the id of the created story or false when error.
*/
public function create($projectID = 0, $bugID = 0)
public function create($projectID = 0, $bugID = 0, $from = '')
{
$now = helper::now();
$story = fixer::input('post')
@@ -232,6 +232,10 @@ class storyModel extends model
}
$this->setStage($storyID);
if(!dao::isError()) $this->loadModel('score')->create('story', 'create',$storyID);
/* Callback the callable method to process the related data for object that is transfered to story. */
if($from && is_callable(array($this, $this->config->story->fromObjects[$from]['callback']))) call_user_func(array($this, $this->config->story->fromObjects[$from]['callback']), $storyID);
return array('status' => 'created', 'id' => $storyID);
}
return false;