diff --git a/module/gitlab/config/dtable.php b/module/gitlab/config/dtable.php index a9e23ee365..cfba58d762 100644 --- a/module/gitlab/config/dtable.php +++ b/module/gitlab/config/dtable.php @@ -173,10 +173,10 @@ $config->gitlab->dtable->user->fieldList['id']['title'] = $lang->gitlab->user->i $config->gitlab->dtable->user->fieldList['id']['type'] = 'id'; $config->gitlab->dtable->user->fieldList['id']['width'] = '80px'; -$config->gitlab->dtable->user->fieldList['name']['title'] = $lang->gitlab->user->name; -$config->gitlab->dtable->user->fieldList['name']['name'] = 'name'; -$config->gitlab->dtable->user->fieldList['name']['type'] = 'html'; -$config->gitlab->dtable->user->fieldList['name']['sortType'] = true; +$config->gitlab->dtable->user->fieldList['user']['title'] = $lang->gitlab->user->name; +$config->gitlab->dtable->user->fieldList['user']['name'] = 'name'; +$config->gitlab->dtable->user->fieldList['user']['type'] = 'avatarName'; +$config->gitlab->dtable->user->fieldList['user']['sortType'] = true; $config->gitlab->dtable->user->fieldList['createOn']['title'] = $lang->gitlab->user->createOn; diff --git a/module/gitlab/ui/browseuser.html.php b/module/gitlab/ui/browseuser.html.php index 0df493854b..be42f3bdc4 100644 --- a/module/gitlab/ui/browseuser.html.php +++ b/module/gitlab/ui/browseuser.html.php @@ -39,7 +39,8 @@ foreach($gitlabUserList as $gitlabUser) $gitlabUser->createOn = substr($gitlabUser->createdAt, 0, 10); $gitlabUser->lastActivity = substr($gitlabUser->lastActivityOn, 0, 10); $gitlabUser->isAdmin = $isAdmin; - $gitlabUser->name = html::image($gitlabUser->avatar, "height=40") . '' .$gitlabUser->realname . ' ' . $gitlabUser->account . ' ' . $gitlabUser->email; + $gitlabUser->name = $gitlabUser->realname . ' ' . $gitlabUser->account . ' ' . $gitlabUser->email; + $gitlabUser->nameAvatar = $gitlabUser->avatar; } $gitlabUserList = initTableData($gitlabUserList, $config->gitlab->dtable->user->fieldList, $this->gitlab); @@ -92,6 +93,5 @@ dtable set::cols($config->gitlab->dtable->user->fieldList), set::data($gitlabUserList), set::sortLink(createLink('gitlab', 'browseUser', "gitlabID={$gitlabID}&orderBy={name}_{sortType}")), - set::onRenderCell(jsRaw('window.renderCell')), set::orderBy($orderBy), );