From 1cc0ac07139e69135f476a49a5212057a9b08f32 Mon Sep 17 00:00:00 2001 From: Manfred Hoffmann <48651533+manne65-hd@users.noreply.github.com> Date: Fri, 3 Apr 2020 06:16:13 +0200 Subject: [PATCH] Show group membership(s) in user-summary and user-list --- app/Helper/UserHelper.php | 12 ++++++++++++ app/Locale/bs_BA/translations.php | 1 + app/Locale/ca_ES/translations.php | 1 + app/Locale/cs_CZ/translations.php | 1 + app/Locale/da_DK/translations.php | 1 + app/Locale/de_DE/translations.php | 1 + app/Locale/el_GR/translations.php | 1 + app/Locale/es_ES/translations.php | 1 + app/Locale/es_VE/translations.php | 1 + app/Locale/fa_IR/translations.php | 1 + app/Locale/fi_FI/translations.php | 1 + app/Locale/fr_FR/translations.php | 1 + app/Locale/hr_HR/translations.php | 1 + app/Locale/hu_HU/translations.php | 1 + app/Locale/id_ID/translations.php | 1 + app/Locale/it_IT/translations.php | 1 + app/Locale/ja_JP/translations.php | 1 + app/Locale/ko_KR/translations.php | 1 + app/Locale/my_MY/translations.php | 1 + app/Locale/nb_NO/translations.php | 1 + app/Locale/nl_NL/translations.php | 1 + app/Locale/pl_PL/translations.php | 1 + app/Locale/pt_BR/translations.php | 1 + app/Locale/pt_PT/translations.php | 1 + app/Locale/ro_RO/translations.php | 1 + app/Locale/ru_RU/translations.php | 1 + app/Locale/sk_SK/translations.php | 1 + app/Locale/sr_Latn_RS/translations.php | 1 + app/Locale/sv_SE/translations.php | 1 + app/Locale/th_TH/translations.php | 1 + app/Locale/tr_TR/translations.php | 1 + app/Locale/uk_UA/translations.php | 1 + app/Locale/vi_VN/translations.php | 1 + app/Locale/zh_CN/translations.php | 1 + app/Locale/zh_TW/translations.php | 1 + app/Template/user_list/user_details.php | 4 ++++ app/Template/user_view/show.php | 1 + 37 files changed, 51 insertions(+) diff --git a/app/Helper/UserHelper.php b/app/Helper/UserHelper.php index 02d1d4513..7edcba9c7 100644 --- a/app/Helper/UserHelper.php +++ b/app/Helper/UserHelper.php @@ -109,6 +109,18 @@ class UserHelper extends Base return $this->role->getRoleName($role ?: $this->userSession->getRole()); } + /** + * Get group names(as a comma-separated list) for a given user + * + * @access public + * @param integer $user_id User id + * @return string + */ + public function getGroupNames($user_id) + { + return implode(', ', array_column($this->groupMemberModel->getGroups($user_id), 'name')); + } + /** * Check application access * diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index 7629c1434..fd2e37fba 100644 --- a/app/Locale/bs_BA/translations.php +++ b/app/Locale/bs_BA/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Ukloni grupu', 'Group removed successfully.' => 'Grupa uspješno uklonjena.', 'Unable to remove this group.' => 'Nemoguće ukloniti grupu.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Prava na projektu', 'Manager' => 'Menadžer', 'Project Manager' => 'Menadžer projekta', diff --git a/app/Locale/ca_ES/translations.php b/app/Locale/ca_ES/translations.php index b0a126cef..9f1efe002 100644 --- a/app/Locale/ca_ES/translations.php +++ b/app/Locale/ca_ES/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Elimina el grup', 'Group removed successfully.' => 'Grup eliminat correctament.', 'Unable to remove this group.' => 'No es pot eliminar aquest grup.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Permisos de projectes', 'Manager' => 'Gerent', 'Project Manager' => 'Gerent de projectes', diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php index 5b43213ed..9b17d3f4a 100644 --- a/app/Locale/cs_CZ/translations.php +++ b/app/Locale/cs_CZ/translations.php @@ -838,6 +838,7 @@ return array( // 'Remove group' => '', // 'Group removed successfully.' => '', // 'Unable to remove this group.' => '', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Oprávnění projektu', 'Manager' => 'Správce', 'Project Manager' => 'Správce projektu', diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index e00cf1f3b..c635d91b1 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Fjerne gruppe', 'Group removed successfully.' => 'Gruppe fjernet.', 'Unable to remove this group.' => 'Kan ikke fjerne gruppe.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Projekt tilladelser', 'Manager' => 'Leder', 'Project Manager' => 'Projektleder', diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index 6c02dc3d4..186ad6262 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Gruppe löschen', 'Group removed successfully.' => 'Gruppe erfolgreich gelöscht.', 'Unable to remove this group.' => 'Gruppe konnte nicht gelöscht werden.', + 'Group membership(s):' => 'Gruppen-Mitgliedschaft(en):', 'Project Permissions' => 'Projekt Berechtigungen', 'Manager' => 'Manager', 'Project Manager' => 'Projekt Manager', diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php index 68b050279..e13d40ba6 100644 --- a/app/Locale/el_GR/translations.php +++ b/app/Locale/el_GR/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Αφαίρεση ομάδας', 'Group removed successfully.' => 'Η ομάδα αφαιρέθηκε με επιτυχία.', 'Unable to remove this group.' => 'Δεν είναι δυνατή η αφαίρεση της ομάδας.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Επιτρέψεις έργου', 'Manager' => 'Διευθυντής', 'Project Manager' => 'Διευθυντής έργου', diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index 9a6af24e5..af2c7e744 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Eliminar grupo', 'Group removed successfully.' => 'Grupo eliminado correctamente.', 'Unable to remove this group.' => 'No se pudo eliminar este grupo.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Permisos del proyecto', 'Manager' => 'Gerente', 'Project Manager' => 'Gerente de proyecto', diff --git a/app/Locale/es_VE/translations.php b/app/Locale/es_VE/translations.php index 09a81a6e0..324a67ede 100644 --- a/app/Locale/es_VE/translations.php +++ b/app/Locale/es_VE/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Eliminar grupo', 'Group removed successfully.' => 'Grupo eliminado correctamente.', 'Unable to remove this group.' => 'No se pudo eliminar este grupo.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Permisos del proyecto', 'Manager' => 'Gerente', 'Project Manager' => 'Gerente de proyecto', diff --git a/app/Locale/fa_IR/translations.php b/app/Locale/fa_IR/translations.php index c169e1912..48b826451 100644 --- a/app/Locale/fa_IR/translations.php +++ b/app/Locale/fa_IR/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'حذف گروه', 'Group removed successfully.' => 'گروه با موفقیت حذف شد.', 'Unable to remove this group.' => 'حذف این گروه امکان پذیر نیست.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'مجوز های پروژه', 'Manager' => 'مدیر', 'Project Manager' => 'مدیر پروژه', diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index 05e2e7a18..14a7e831c 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -838,6 +838,7 @@ return array( // 'Remove group' => '', // 'Group removed successfully.' => '', // 'Unable to remove this group.' => '', + // 'Group membership(s):' => ':', // 'Project Permissions' => '', // 'Manager' => '', // 'Project Manager' => '', diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index 7296bbf07..8c4ce671a 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Supprimer le groupe', 'Group removed successfully.' => 'Groupe supprimé avec succès.', 'Unable to remove this group.' => 'Impossible de supprimer ce groupe.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Permissions du projet', 'Manager' => 'Gestionnaire', 'Project Manager' => 'Chef de projet', diff --git a/app/Locale/hr_HR/translations.php b/app/Locale/hr_HR/translations.php index 232f130d4..ddfab6c08 100644 --- a/app/Locale/hr_HR/translations.php +++ b/app/Locale/hr_HR/translations.php @@ -838,6 +838,7 @@ return array( // 'Remove group' => '', // 'Group removed successfully.' => '', // 'Unable to remove this group.' => '', + // 'Group membership(s):' => ':', // 'Project Permissions' => '', // 'Manager' => '', // 'Project Manager' => '', diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index 85fdf9d70..d90e631df 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Csoport eltávolítása', 'Group removed successfully.' => 'A csoport sikeresen eltávolítva.', 'Unable to remove this group.' => 'Nem lehet eltávolítani a csoportot.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Projektjogosultságok', 'Manager' => 'Vezető', 'Project Manager' => 'Projektvezető', diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php index 9f5b7c70b..c3cbb3659 100644 --- a/app/Locale/id_ID/translations.php +++ b/app/Locale/id_ID/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Hapus grup', 'Group removed successfully.' => 'Grup berhasil dihapus', 'Unable to remove this group.' => 'Tidak dapat menghapus grup ini', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Izin Proyek', 'Manager' => 'Manajer', 'Project Manager' => 'Manajer Proyek', diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index 659ead372..54bd13ae0 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Rimuovi gruppo', 'Group removed successfully.' => 'Gruppo rimosso con successo.', 'Unable to remove this group.' => 'Impossibile rimuovere questo gruppo.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Permessi del progetto', 'Manager' => 'Manager', 'Project Manager' => 'Manager del progetto', diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index a724d4a0b..6fd9d4bf8 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'グループを削除', 'Group removed successfully.' => 'グループは正常に削除されました', 'Unable to remove this group.' => 'このグループを削除できません', + // 'Group membership(s):' => ':', 'Project Permissions' => 'プロジェクトの権限', 'Manager' => '組織の管理者', 'Project Manager' => 'プロジェクト管理者', diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php index 68ab8b3a1..32aabcd03 100644 --- a/app/Locale/ko_KR/translations.php +++ b/app/Locale/ko_KR/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => '그룹 삭제', 'Group removed successfully.' => '그룹이 성공적으로 삭제되었습니다', 'Unable to remove this group.' => '그룹 삭제 비활성화', + // 'Group membership(s):' => ':', 'Project Permissions' => '프로젝트 권한', 'Manager' => '매니저', 'Project Manager' => '프로젝트 매니저', diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php index 92e834280..b33848610 100644 --- a/app/Locale/my_MY/translations.php +++ b/app/Locale/my_MY/translations.php @@ -838,6 +838,7 @@ return array( // 'Remove group' => '', // 'Group removed successfully.' => '', // 'Unable to remove this group.' => '', + // 'Group membership(s):' => ':', // 'Project Permissions' => '', // 'Manager' => '', // 'Project Manager' => '', diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php index 9a96759bb..cab0465f3 100644 --- a/app/Locale/nb_NO/translations.php +++ b/app/Locale/nb_NO/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Fjern gruppe', 'Group removed successfully.' => 'Gruppen er fjernet', 'Unable to remove this group.' => 'Kunne ikke fjerne gruppen', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Prosjektrettigheter', 'Manager' => 'Leder', 'Project Manager' => 'Prosjektleder', diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index 60b448fcf..6d560fde2 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -838,6 +838,7 @@ return array( // 'Remove group' => '', // 'Group removed successfully.' => '', // 'Unable to remove this group.' => '', + // 'Group membership(s):' => ':', // 'Project Permissions' => '', // 'Manager' => '', // 'Project Manager' => '', diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 9a6d44007..ed2896db5 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Usuń grupę', 'Group removed successfully.' => 'Grupa została usunięta.', 'Unable to remove this group.' => 'Nie można usunąć grupy.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Prawa dostępowe projektu', 'Manager' => 'Menedżer', 'Project Manager' => 'Menedżer projektu', diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index 8c4e881c5..bca6573a9 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Remover o grupo', 'Group removed successfully.' => 'Grupo removido com sucesso.', 'Unable to remove this group.' => 'Não foi possível remover este grupo.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Permissões do projeto', 'Manager' => 'Gerente', 'Project Manager' => 'Gerente de projeto', diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php index d6c423a81..08c4f943e 100644 --- a/app/Locale/pt_PT/translations.php +++ b/app/Locale/pt_PT/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Remover grupo.', 'Group removed successfully.' => 'Grupo removido com sucesso.', 'Unable to remove this group.' => 'Não foi possivel remover este grupo.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Permissões de Projeto', 'Manager' => 'Gestor', 'Project Manager' => 'Gestor de Projeto', diff --git a/app/Locale/ro_RO/translations.php b/app/Locale/ro_RO/translations.php index c1b75d0de..4730fea5f 100644 --- a/app/Locale/ro_RO/translations.php +++ b/app/Locale/ro_RO/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Șterge grupul', 'Group removed successfully.' => 'Grupul a fost șters.', 'Unable to remove this group.' => 'Nu am putut șterge grupul.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Permisiunile proiectului', 'Manager' => 'Gestionar', 'Project Manager' => 'Șef de proiect', diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 97123d5d8..57bdeb1de 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Удалить группу', 'Group removed successfully.' => 'Группа успешно удалена.', 'Unable to remove this group.' => 'Невозможно удалить группу.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Разрешения проекта', 'Manager' => 'Менеджер', 'Project Manager' => 'Менеджер проекта', diff --git a/app/Locale/sk_SK/translations.php b/app/Locale/sk_SK/translations.php index 311c6f355..55c091d5c 100644 --- a/app/Locale/sk_SK/translations.php +++ b/app/Locale/sk_SK/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Odstrániť skupinu', 'Group removed successfully.' => 'Skupina úspešne odstránená.', 'Unable to remove this group.' => 'Nemožno odstrániť skupinu.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Povolenia projektu', 'Manager' => 'Správca', 'Project Manager' => 'Správca projektu', diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index 24cf86578..5a11c13b8 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -838,6 +838,7 @@ return array( // 'Remove group' => '', // 'Group removed successfully.' => '', // 'Unable to remove this group.' => '', + // 'Group membership(s):' => ':', // 'Project Permissions' => '', // 'Manager' => '', // 'Project Manager' => '', diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index 13d75e099..4adb994b0 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Ta bort grupp', // 'Group removed successfully.' => '', // 'Unable to remove this group.' => '', + // 'Group membership(s):' => ':', // 'Project Permissions' => '', // 'Manager' => '', 'Project Manager' => 'Projektägare', diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index cfd5cc767..827979711 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'ลบกลุ่ม', 'Group removed successfully.' => 'ลบกลุ่มเรียบร้อย', 'Unable to remove this group.' => 'ไม่สามารถลบกลุ่มนี้', + // 'Group membership(s):' => ':', 'Project Permissions' => 'การอนุญาตใช้งานโปรเจค', 'Manager' => 'ผู้จัดการ', 'Project Manager' => 'ผู้จัดการโปรเจค', diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index f4f05ab36..945266408 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Grubu sil', 'Group removed successfully.' => 'Grup başarıyla silindi.', 'Unable to remove this group.' => 'Grup silinemedi.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Proje izimleri', 'Manager' => 'Müdür', 'Project Manager' => 'Proje müdürü', diff --git a/app/Locale/uk_UA/translations.php b/app/Locale/uk_UA/translations.php index 39154abcc..a5f1507b6 100644 --- a/app/Locale/uk_UA/translations.php +++ b/app/Locale/uk_UA/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Видалити групу', 'Group removed successfully.' => 'Групу успішно видалено.', 'Unable to remove this group.' => 'Не вдалося видалити групу.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Дозволи проєкту', 'Manager' => 'Керівник', 'Project Manager' => 'Керівник проєкту', diff --git a/app/Locale/vi_VN/translations.php b/app/Locale/vi_VN/translations.php index ceed44d5f..379781c65 100644 --- a/app/Locale/vi_VN/translations.php +++ b/app/Locale/vi_VN/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => 'Loại bỏ nhóm', 'Group removed successfully.' => 'Nhóm đã xoá thành công.', 'Unable to remove this group.' => 'Không thể xóa nhóm này.', + // 'Group membership(s):' => ':', 'Project Permissions' => 'Quyền dự án', 'Manager' => 'Giám đốc', 'Project Manager' => 'Quản lý dự án', diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index 2b5e8c393..6301c53f7 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => '删除用户组', 'Group removed successfully.' => '用户组已删除', 'Unable to remove this group.' => '无法删除该用户组', + // 'Group membership(s):' => ':', 'Project Permissions' => '项目权限', 'Manager' => '管理员', 'Project Manager' => '项目管理员', diff --git a/app/Locale/zh_TW/translations.php b/app/Locale/zh_TW/translations.php index c305ce770..80dbd3a96 100644 --- a/app/Locale/zh_TW/translations.php +++ b/app/Locale/zh_TW/translations.php @@ -838,6 +838,7 @@ return array( 'Remove group' => '删除群組', 'Group removed successfully.' => '群組已删除', 'Unable to remove this group.' => '無法删除群組', + // 'Group membership(s):' => ':', 'Project Permissions' => '專案全線', 'Manager' => '管理員', 'Project Manager' => '專案管理員', diff --git a/app/Template/user_list/user_details.php b/app/Template/user_list/user_details.php index 8fc5e485d..ae266ba36 100644 --- a/app/Template/user_list/user_details.php +++ b/app/Template/user_list/user_details.php @@ -10,4 +10,8 @@ text->e($user['email']) ?> + + user->getGroupNames($user['id'])) ): ?> + user->getGroupNames($user['id']) ?> + diff --git a/app/Template/user_view/show.php b/app/Template/user_view/show.php index 6172c5614..322c056db 100644 --- a/app/Template/user_view/show.php +++ b/app/Template/user_view/show.php @@ -14,6 +14,7 @@