Merge branch 'master_xieqiyu_kanban' into 'master'

* Code for task#59546. Update create story and copy bug.

See merge request easycorp/zentaopms!4391
This commit is contained in:
王怡栋
2022-07-07 01:40:11 +00:00
7 changed files with 124 additions and 47 deletions
+4 -3
View File
@@ -410,11 +410,12 @@ class bug extends control
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $bugID));
/* If link from no head then reload. */
if(isset($output['executionID']) and isonlybody())
if(isonlybody())
{
$executionID = $this->post->execution ? $this->post->execution : $output['executionID'];
$executionID = isset($output['executionID']) ? $output['executionID'] : $this->session->execution;
$executionID = $this->post->execution ? $this->post->execution : $executionID;
$execution = $this->loadModel('execution')->getByID($executionID);
if($executionID == $output['executionID'] and $this->app->tab == 'execution' and $execution->type == 'kanban')
if($this->app->tab == 'execution' and $execution->type == 'kanban')
{
$execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
$execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';