diff --git a/module/product/control.php b/module/product/control.php index 57f9d33041..6cae4399b8 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -84,6 +84,7 @@ class product extends control /* Get PM id list. */ $accounts = array(); $projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $involved); + foreach($projectStats as $project) { if(!empty($project->PM) and !in_array($project->PM, $accounts)) $accounts[] = $project->PM; diff --git a/module/product/css/project.css b/module/product/css/project.css index 8aba86141d..7ca7322acc 100644 --- a/module/product/css/project.css +++ b/module/product/css/project.css @@ -1,3 +1,4 @@ .checkbox-primary {margin-top: 6px;} .tip {display: inline-block; vertical-align: middle; margin-top: 6px;} #mainMenu .icon.icon-help {margin-left: 5px;} +td.padding-right {padding-right: 20px !important} diff --git a/module/product/model.php b/module/product/model.php index a6c08334d6..76ec9eca68 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -851,7 +851,11 @@ class productModel extends model /* Determine how to display the name of the program. */ $programList = $this->loadModel('program')->getParentPairs('', 'noclosed'); - foreach($projectList as $id => $project) $projectList[$id]->programName = $programList[$project->parent]; + foreach($projectList as $id => $project) + { + $projectList[$id]->programName = $project->parent ? $programList[$project->parent] : ''; + $projectList[$id]->programName = preg_replace('/\//', '', $projectList[$id]->programName, 1); + } return $projectList; } diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index fce5ba8ed7..6fcbd1ea08 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -34,16 +34,16 @@