diff --git a/module/project/model.php b/module/project/model.php index 2d5fedce17..be500760cc 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2274,13 +2274,15 @@ class projectModel extends model } break; case 'name': - $prefix = ''; - $suffix = ''; + $prefix = ''; + $suffix = ''; + $projectIcon = ''; if(isset($project->delay)) $suffix = "{$this->lang->project->statusList['delay']}"; $projectType = $project->model == 'scrum' ? 'sprint' : $project->model; if(!empty($suffix) or !empty($prefix)) echo '
'; if(!empty($prefix)) echo $prefix; - echo html::a($projectLink, " " . $project->name, '', "class='text-ellipsis text-primary'"); + if($this->config->vision == 'rnd') $projectIcon = " "; + echo html::a($projectLink, $projectIcon . $project->name, '', "class='text-ellipsis text-primary'"); if(!empty($suffix)) echo $suffix; if(!empty($suffix) or !empty($prefix)) echo '
'; break; diff --git a/module/testcase/control.php b/module/testcase/control.php index 0dc9edb3bd..8f44396214 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -998,7 +998,14 @@ class testcase extends control if($case->module) $moduleIdList = $this->tree->getAllChildID($case->module); $moduleIdList = (!in_array($this->app->tab, array('execution', 'project')) and empty($stories)) ? 0 : $moduleIdList; - $stories = $this->story->getProductStoryPairs($productID, $case->branch, $moduleIdList, 'all','id_desc', 0, 'full', 'story', false); + if($this->app->tab == 'execution') + { + $stories = $this->story->getExecutionStoryPairs($case->execution, $productID, $case->branch, $moduleIdList); + } + else + { + $stories = $this->story->getProductStoryPairs($productID, $case->branch, $moduleIdList, 'all','id_desc', 0, 'full', 'story', false); + } $this->view->productID = $productID; $this->view->product = $product;