diff --git a/module/execution/model.php b/module/execution/model.php index 0dcb765c03..779d9093d7 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1639,7 +1639,7 @@ class executionModel extends model if($execution->parent < 0 and $execution->type == 'stage') unset($executions[$key]); if($execution->projectName) $execution->name = $execution->projectName . ' / ' . $execution->name; } - else + elseif($param != 'importKanban') { if(isset($executions[$execution->parent]) and $execution->type == 'stage') { diff --git a/module/kanban/control.php b/module/kanban/control.php index ad818eafd1..2e2ce68024 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1379,10 +1379,17 @@ class kanban extends control $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); + $executions = $this->execution->getStatData($selectedProjectID, 'undone', 0, 0, false, 'importKanban', 'id_asc', $pager); + foreach($executions as $execution) + { + $parentExecutions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->in(trim($execution->path, ','))->andWhere('type')->in('stage,kanban,sprint')->orderBy('grade')->fetchPairs(); + $execution->name = implode('/', $parentExecutions); + } + $this->view->projects = array($this->lang->kanban->allProjects) + $this->project->getPairsByProgram('', 'all', false, '', '', '', 'multiple'); $this->view->selectedProjectID = $selectedProjectID; $this->view->lanePairs = $this->kanban->getLanePairsByGroup($groupID); - $this->view->executions2Imported = $this->execution->getStatData($selectedProjectID, 'undone', 0, 0, false, '', 'id_asc', $pager); + $this->view->executions2Imported = $executions; $this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted'); $this->view->pager = $pager; $this->view->kanbanID = $kanbanID; diff --git a/module/kanban/model.php b/module/kanban/model.php index 7b2a72261f..b9e6bbb158 100755 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1281,6 +1281,9 @@ class kanbanModel extends model } $objectCard->execType = $object->type; $objectCard->progress = isset($executionProgress[$objectID]->progress) ? $executionProgress[$objectID]->progress : 0; + + $parentExecutions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->in(trim($object->path, ','))->andWhere('type')->in('stage,kanban,sprint')->orderBy('grade')->fetchPairs(); + $objectCard->name = implode('/', $parentExecutions); } $objectCard->desc = strip_tags(htmlspecialchars_decode($object->desc));