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

Merge branch 'cyy_bug' into 'master'

Browse Source 
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
This commit is contained in:
孙广明
2023-03-01 09:13:25 +00:00
parent ed3a128e50 046187237e
commit db4662cfbc
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/execution/control.php
View File

@@ -2633,11 +2633,14 @@ class execution extends control
$this->session->set('execGroupBy', $groupBy);
$this->session->set('storyList', $this->app->getURI(true), 'execution');
$this->session->set('rdSearchValue', '');
$this->session->set('execLaneType', $browseType);
$features = $this->execution->getExecutionFeatures($execution);
$kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy);
/* Set lane type. */
if(!$features['story'] and !$features['qa']) $browseType = 'task';
$this->session->set('execLaneType', $browseType);
/* Remove lanes if no feature. */
foreach($kanbanData as $regionID => $region)
{
@@ -2736,7 +2739,6 @@ class execution extends control
$uri = $this->app->getURI(true);
$this->app->session->set('taskList', $uri, 'execution');
$this->app->session->set('bugList', $uri, 'qa');
$this->app->session->set('execLaneType', $browseType);
$this->app->session->set('execGroupBy', $groupBy);
/* Load language. */
@@ -2755,6 +2757,8 @@ class execution extends control
unset($this->lang->kanban->group->task['story']);
}
$this->app->session->set('execLaneType', $browseType);
if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'id_asc';
$kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, '', $orderBy);