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

Merge branch 'sprint/176_songchenxuan_45538' into 'master'

Browse Source 
*Finish task #45538.

See merge request easycorp/zentaopms!886
This commit is contained in:
朱金勇
2021-12-10 06:07:32 +00:00
parent d148ae7cf4 f77b8ddb9b
commit e8feeca41e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+10 -9
View File
@@ -1826,15 +1826,16 @@ class storyModel extends model
if(strpos('draft,closed', $story->status) !== false) continue;
$task = new stdclass();
$task->execution = $executionID;
$task->project = $projectID;
$task->name = $story->title;
$task->story = $story->id;
$task->type = $data->type;
$task->estimate = isset($data->hourPointValue) ? ($story->estimate * $data->hourPointValue) : $story->estimate;
$task->left = $task->estimate;
$task->openedBy = $this->app->user->account;
$task->openedDate = $now;
$task->execution = $executionID;
$task->project = $projectID;
$task->name = $story->title;
$task->story = $story->id;
$task->type = $data->type;
$task->estimate = isset($data->hourPointValue) ? ($story->estimate * $data->hourPointValue) : $story->estimate;
$task->left = $task->estimate;
$task->openedBy = $this->app->user->account;
$task->openedDate = $now;
$task->storyVersion = $story->version;
if(isset($data->fields))
{
module/task/control.php
+1 -1
View File
@@ -199,7 +199,7 @@ class task extends control
$moduleID = $this->tree->getStoryModule($task->module);
$moduleIdList = $this->tree->getAllChildID($moduleID);
}
$stories = $this->story->getExecutionStoryPairs($executionID, 0, 0, $moduleIdList, 'full', 'unclosed');
$stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $moduleIdList, 'full', 'unclosed');
/* Get block id of assinge to me. */
$blockID = 0;