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

* Fix bug #11540.

Browse Source
This commit is contained in:
hufangzhou
2021-03-30 09:31:32 +08:00
parent f8c83e6ab7
commit 95c604cef6
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1
View File
@@ -1193,6 +1193,7 @@ class execution extends control
{
if($this->app->openApp == 'project')
{
if(!empty($copyExecutionID)) $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($copyExecutionID)->fetch('project');
$project = $this->project->getByID($projectID);
$model = $project->model;
module/execution/model.php
+1 -2
View File
@@ -1810,7 +1810,6 @@ class executionModel extends model
$bugToTasks = fixer::input('post')->get();
$bugs = $this->bug->getByList(array_keys($bugToTasks->import));
$projectID = $this->loadModel('task')->getProjectID($executionID);
foreach($bugToTasks->import as $key => $value)
{
$bug = zget($bugs, $key, '');
@@ -1818,7 +1817,7 @@ class executionModel extends model
$task = new stdClass();
$task->bug = $bug;
$task->project = $projectID;
$task->project = $execution->project;
$task->execution = $executionID;
$task->story = $bug->story;
$task->storyVersion = $bug->storyVersion;
module/task/control.php
+9 -2
View File
@@ -258,7 +258,14 @@ class task extends control
}
$execution = $this->execution->getById($executionID);
$taskLink = $this->createLink('execution', 'browse', "executionID=$executionID&tab=task");
if($this->app->openApp == 'my')
{
$taskLink = $this->createLink('my', 'work', 'mode=task');
}
else
{
$taskLink = $this->createLink('execution', 'browse', "executionID=$executionID");
}
$storyLink = $this->session->storyList ? $this->session->storyList : $this->createLink('execution', 'story', "executionID=$executionID");
/* Set menu. */
@@ -279,7 +286,7 @@ class task extends control
/* Locate the browser. */
if(!empty($iframe)) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $storyLink));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $taskLink));
}
/* Set Custom*/