diff --git a/module/program/control.php b/module/program/control.php index e544b5b0e6..3d69cd47b1 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -59,6 +59,7 @@ class program extends control $this->view->status = $status; $this->view->orderBy = $orderBy; $this->view->users = $this->user->getPairs('noletter'); + $this->view->usersAvatar = $this->user->getAvatarPairs(); $this->view->programType = $programType; $this->view->PMList = $PMList; diff --git a/module/program/css/browse.css b/module/program/css/browse.css index 61b2befe5e..25b84ab23f 100644 --- a/module/program/css/browse.css +++ b/module/program/css/browse.css @@ -2,3 +2,4 @@ .main-table tbody>tr>td:first-child, .main-table thead>tr>th:first-child {padding-left: 8px;} .table tbody>tr>td .dropdown {display: inline-block; line-height: 1;} tbody.sortable > tr > td.sort-handler .table-nest-toggle:before {cursor: pointer !important;} +.avatar {display: inline-block; width: 20px; height: 20px; line-height: 20px; top: 5px;} diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 4cf5139d66..55738d6d15 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -55,8 +55,14 @@ project->statusList, $program->status, '');?> - PM]) ? $PMList[$program->PM]->id : ''?> - PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $program->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");?> + PM)):?> +
+ PM, '')) ? html::image(zget($usersAvatar, $program->PM)) : strtoupper($program->PM[0]);?> +
+ PM]) ? $PMList[$program->PM]->id : '';?> + PM);?> + createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'");?> + app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$program->budget / 10000, 2) . $lang->project->tenThousand : round((float)$program->budget, 2);?> budget != 0 ? zget($lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $lang->project->future;?> diff --git a/module/user/model.php b/module/user/model.php index 51ed604609..a329c97d46 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -132,6 +132,21 @@ class userModel extends model return $users; } + /** + * Get user's avatar pairs. + * + * @access public + * @return array + */ + public function getAvatarPairs() + { + $avatarPairs = array(); + $userList = $this->getList(); + foreach($userList as $user) $avatarPairs[$user->account] = $user->avatar; + + return $avatarPairs; + } + /** * Get commiters from the user table. * @@ -1887,7 +1902,7 @@ class userModel extends model { $stakeholders = zget($stakeholderGroup, $program->id, array()); $whiteList = zget($whiteListGroup, $program->id, array()); - if($program->acl == 'program') + if($program->acl == 'program') { $stakeholders += zget($parentStakeholderGroup, $program->id, array()); $stakeholders += zget($parentPMGroup, $program->id, array()); @@ -1911,7 +1926,7 @@ class userModel extends model { $stakeholders = zget($stakeholderGroup, $program->id, array()); $whiteList = zget($whiteListGroup, $program->id, array()); - if($program->acl == 'program') + if($program->acl == 'program') { $stakeholders += zget($parentStakeholderGroup, $program->id, array()); $stakeholders += zget($parentPMGroup, $program->id, array());