Merge branch 'sprint/tianshujie_fixbug' into 'master'

Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2447
This commit is contained in:
李玉春
2022-03-22 07:55:27 +00:00
6 changed files with 18 additions and 5 deletions
+5 -1
View File
@@ -1977,6 +1977,8 @@ class execution extends control
$type = $this->config->vision == 'lite' ? 'kanban' : 'stage,sprint,kanban';
if(empty($execution) || strpos($type, $execution->type) === false) return print(js::error($this->lang->notFound) . js::locate('back'));
if($execution->type == 'kanban') return $this->locate(inlink('kanban', "executionID=$executionID"));
$this->app->loadLang('program');
/* Execution not found to prevent searching for .*/
@@ -2043,7 +2045,9 @@ class execution extends control
$this->session->set('execLaneType', $browseType);
$this->lang->execution->menu = new stdclass();
$execution = $this->commonAction($executionID);
$execution = $this->commonAction($executionID);
if($execution->type != 'kanban') return $this->locate(inlink('view', "executionID=$executionID"));
$kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy);
$executionActions = array();