diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index e789d5a070..26fb4e08a2 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -53,7 +53,6 @@ type == 'program') $icon = ' icon-program'; - if($program->type == 'project') $icon = ' icon-common icon-' . $program->model; $class = $program->type == 'program' ? ' table-nest-toggle' : ''; ?> @@ -61,7 +60,8 @@   user->admin or strpos(",{$app->user->view->programs},", ",$program->id,") !== false) ? html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name) : $program->name;?> - createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', 'class="text-ellipsis text-primary"');?> + project->{$program->model};?> + createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', "class='text-ellipsis text-primary' title='{$program->name} ($projectType)'");?> status != 'done' and $program->status != 'closed' and $program->status != 'suspended') { diff --git a/module/project/model.php b/module/project/model.php index 381f394d4c..1c27eee429 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1979,7 +1979,7 @@ class projectModel extends model if($id == 'name') { $class .= ' text-left'; - $title = "title='{$project->name}'"; + $title = "title='{$project->name} ({$this->lang->project->{$project->model}})'"; } if($id == 'end') @@ -2018,9 +2018,6 @@ class projectModel extends model case 'name': $prefix = ''; $suffix = ''; - if($project->model === 'waterfall') $prefix = "{$this->lang->project->waterfall} "; - if($project->model === 'scrum') $prefix = "{$this->lang->project->scrum} "; - if($project->model === 'kanban') $prefix = "{$this->lang->project->kanban} "; if(isset($project->delay)) $suffix = "{$this->lang->project->statusList['delay']}"; if(!empty($suffix) or !empty($prefix)) echo '
'; if(!empty($prefix)) echo $prefix;