From c9921b386cf1f9d2d31fc60a13ad83e54a341ee7 Mon Sep 17 00:00:00 2001 From: Philipp Dorschner Date: Wed, 25 Sep 2019 10:39:46 +0200 Subject: [PATCH 1/6] Load user roles and populate to view --- application/controllers/UserController.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php index cdf2b77da..5a5b3c754 100644 --- a/application/controllers/UserController.php +++ b/application/controllers/UserController.php @@ -5,6 +5,7 @@ namespace Icinga\Controllers; use Exception; use Icinga\Application\Logger; +use Icinga\Authentication\AdmissionLoader; use Icinga\Authentication\User\DomainAwareInterface; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Exception\ConfigurationError; @@ -165,6 +166,10 @@ class UserController extends AuthBackendController )); $this->view->removeForm = $removeForm; } + + $admissionLoader = new AdmissionLoader(); + $admissionLoader->applyRoles($userObj); + $this->view->userObj = $userObj; } /** From 8645035ecc21ea5dfb507b379e4d9e9560637c24 Mon Sep 17 00:00:00 2001 From: Philipp Dorschner Date: Wed, 25 Sep 2019 10:41:58 +0200 Subject: [PATCH 2/6] Display the roles of a user --- application/views/scripts/user/show.phtml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml index 51c627ff7..aaeffd51e 100644 --- a/application/views/scripts/user/show.phtml +++ b/application/views/scripts/user/show.phtml @@ -40,6 +40,27 @@ use Icinga\Data\Selectable; translate('Last modified'); ?> last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?> + + translate('Role Memberships'); ?> + + getRoles(); ?> + + + +

translate('No memberships found'); ?>

+ + + compact): ?>

translate('Group Memberships'); ?>

From 5e22caab6100b0001d702922b577515995c11b51 Mon Sep 17 00:00:00 2001 From: Philipp Dorschner Date: Wed, 25 Sep 2019 10:42:17 +0200 Subject: [PATCH 3/6] Style role memberships --- public/css/icinga/main.less | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less index 36b438752..7f794c356 100644 --- a/public/css/icinga/main.less +++ b/public/css/icinga/main.less @@ -340,3 +340,21 @@ a:hover > .icon-cancel { opacity: 1; } } + +.role-memberships { + letter-spacing: -0.417em; + list-style-type: none; + margin: 0; + padding: 0; + + > li { + display: inline-block; + letter-spacing: normal; + margin: 0; + padding: 0 0.25em 0 0; + + &:last-child { + padding-right: 0; + } + } +} \ No newline at end of file From 57b64f85bfe141160bbb8bb4b166be6fcd9c1810 Mon Sep 17 00:00:00 2001 From: Philipp Dorschner Date: Wed, 25 Sep 2019 10:58:43 +0200 Subject: [PATCH 4/6] de_DE: Translate "Role Memberships" --- .../locale/de_DE/LC_MESSAGES/icinga.mo | Bin 70693 -> 70828 bytes .../locale/de_DE/LC_MESSAGES/icinga.po | 75 ++++++++++-------- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/application/locale/de_DE/LC_MESSAGES/icinga.mo b/application/locale/de_DE/LC_MESSAGES/icinga.mo index 982cbbfa9cc9a6570d20084c318191ad162ee399..49793daf5e8dfbb68db061cb98e9e85aedb764bd 100644 GIT binary patch delta 14573 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 delta 14522 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 z\n" "Language: de_DE\n" "MIME-Version: 1.0\n" @@ -152,7 +152,7 @@ msgid "Acknowledge this announcement" msgstr "Diese Bekanntmachung bestätigen" #: ../../../../application/forms/Config/User/UserForm.php:24 -#: ../../../../application/controllers/UserController.php:80 +#: ../../../../application/controllers/UserController.php:81 #: ../../../../application/views/scripts/user/show.phtml:33 #: ../../../../library/Icinga/Authentication/User/LdapUserBackend.php:270 #: ../../../../library/Icinga/Authentication/User/DbUserBackend.php:105 @@ -399,7 +399,7 @@ msgctxt "group.membership" msgid "Cancel" msgstr "Beenden" -#: ../../../../application/controllers/UserController.php:164 +#: ../../../../application/controllers/UserController.php:165 msgid "Cancel this membership" msgstr "Diese Mitgliedschaft beenden" @@ -533,7 +533,7 @@ msgstr "" "Modul-Hooks fehlgeschlagen. Bitte die Logs prüfen" #: ../../../../application/controllers/GroupController.php:377 -#: ../../../../application/controllers/UserController.php:328 +#: ../../../../application/controllers/UserController.php:334 #: ../../../../application/controllers/RoleController.php:116 msgid "" "Configure roles to permit or restrict users and groups accessing Icinga Web 2" @@ -606,7 +606,7 @@ msgstr "Konnte Dashboard nicht speichern" msgid "Create" msgstr "Erstellen" -#: ../../../../application/views/scripts/user/show.phtml:57 +#: ../../../../application/views/scripts/user/show.phtml:83 msgid "Create New Membership" msgstr "Neue Gruppenmitgliedschaft" @@ -693,7 +693,7 @@ msgstr "Erstellt am" #: ../../../../application/controllers/GroupController.php:81 #: ../../../../application/controllers/GroupController.php:117 -#: ../../../../application/controllers/UserController.php:81 +#: ../../../../application/controllers/UserController.php:82 #: ../../../../application/views/scripts/group/show.phtml:33 #: ../../../../application/views/scripts/user/show.phtml:36 #: ../../../../library/Icinga/Authentication/User/DbUserBackend.php:106 @@ -888,6 +888,7 @@ msgid "Edit resource %s" msgstr "Ressource %s bearbeiten" #: ../../../../application/views/scripts/role/list.phtml:36 +#: ../../../../application/views/scripts/user/show.phtml:56 #, php-format msgid "Edit role %s" msgstr "Rolle %s bearbeiten" @@ -1033,7 +1034,7 @@ msgid "Failed to fetch any users from backend %s. Please check your log" msgstr "" "Es konnten keine Benutzer vom Backend %s geholt werden. Bitte Log überprüfen" -#: ../../../../application/controllers/UserController.php:286 +#: ../../../../application/controllers/UserController.php:292 #, php-format msgid "Failed to fetch memberships from backend %s. Please check your log" msgstr "" @@ -1192,8 +1193,8 @@ msgid "Grid Chart" msgstr "Netzansicht" #: ../../../../application/controllers/GroupController.php:357 -#: ../../../../application/controllers/UserController.php:124 -#: ../../../../application/views/scripts/user/show.phtml:78 +#: ../../../../application/controllers/UserController.php:125 +#: ../../../../application/views/scripts/user/show.phtml:104 msgid "Group" msgstr "Benutzergruppe" @@ -1216,7 +1217,7 @@ msgstr "Benutzergruppe \"%s\" wurde entfernt" msgid "Group \"%s\" not found" msgstr "Benutzergruppe \"%s\" wurde nicht gefunden" -#: ../../../../application/views/scripts/user/show.phtml:45 +#: ../../../../application/views/scripts/user/show.phtml:71 msgid "Group Memberships" msgstr "Gruppenmitglieder" @@ -1425,7 +1426,7 @@ msgstr "LDAP Objektklasse für Benutzer" #: ../../../../application/controllers/GroupController.php:82 #: ../../../../application/controllers/GroupController.php:118 -#: ../../../../application/controllers/UserController.php:82 +#: ../../../../application/controllers/UserController.php:83 #: ../../../../application/views/scripts/group/show.phtml:37 #: ../../../../application/views/scripts/user/show.phtml:40 #: ../../../../library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:575 @@ -1457,7 +1458,7 @@ msgid "List announcements" msgstr "Bekanntmachungen auflisten" #: ../../../../application/controllers/GroupController.php:394 -#: ../../../../application/controllers/UserController.php:345 +#: ../../../../application/controllers/UserController.php:351 #: ../../../../application/controllers/RoleController.php:133 msgid "List groups of user group backends" msgstr "Gruppen der Benutzergruppenbackends auflisten" @@ -1467,7 +1468,7 @@ msgid "List intalled modules" msgstr "Installierte Module auflisten" #: ../../../../application/controllers/GroupController.php:386 -#: ../../../../application/controllers/UserController.php:337 +#: ../../../../application/controllers/UserController.php:343 #: ../../../../application/controllers/RoleController.php:125 msgid "List users of authentication backends" msgstr "Benutzer der Authentifizierungsbackends auflisten" @@ -1715,7 +1716,7 @@ msgstr "Neue Ressource erstellen" msgid "New Role" msgstr "Neue Rolle anlegen" -#: ../../../../application/controllers/UserController.php:182 +#: ../../../../application/controllers/UserController.php:188 msgid "New User" msgstr "Neuen Benutzer anlegen" @@ -1798,7 +1799,11 @@ msgid "No group member found matching the filter" msgstr "" "Es wurde kein Gruppenmitglied gefunden, das den Filterkriterien entspricht" -#: ../../../../application/views/scripts/user/show.phtml:71 +#: ../../../../application/views/scripts/user/show.phtml:65 +msgid "No memberships found" +msgstr "Es wurden keine Mitgliedschaften gefunden" + +#: ../../../../application/views/scripts/user/show.phtml:97 msgid "No memberships found matching the filter" msgstr "" "Es wurde keine Mitgliedschaften gefunden, welche den Filterkriterien " @@ -2099,7 +2104,7 @@ msgstr "Ressource entfernen" msgid "Remove Role" msgstr "Rolle entfernen" -#: ../../../../application/controllers/UserController.php:226 +#: ../../../../application/controllers/UserController.php:232 msgid "Remove User" msgstr "Benutzer entfernen" @@ -2277,6 +2282,10 @@ msgstr "" msgid "Restrictions" msgstr "Einschränkungen" +#: ../../../../application/views/scripts/user/show.phtml:44 +msgid "Role Memberships" +msgstr "Rollenmitgliedschaften" + #: ../../../../application/forms/Security/RoleForm.php:151 msgid "Role Name" msgstr "Rollenname" @@ -2311,7 +2320,7 @@ msgid "Role updated" msgstr "Rolle aktualisiert" #: ../../../../application/controllers/GroupController.php:375 -#: ../../../../application/controllers/UserController.php:326 +#: ../../../../application/controllers/UserController.php:332 #: ../../../../application/controllers/RoleController.php:21 #: ../../../../application/controllers/RoleController.php:114 msgid "Roles" @@ -2507,7 +2516,7 @@ msgstr "Dashlet %s anzeigen" msgid "Show detailed information about %s" msgstr "Zeige detaillierte Informationen über %s" -#: ../../../../application/views/scripts/user/show.phtml:91 +#: ../../../../application/views/scripts/user/show.phtml:117 #, php-format msgid "Show detailed information for group %s" msgstr "Zeige detaillierte Informationen über die Gruppe %s" @@ -2535,7 +2544,7 @@ msgstr "Zeige die Zeilen %u bis %u von %u" msgid "Show the overview of the %s module" msgstr "Zeige die Übersicht des Moduls %s" -#: ../../../../application/controllers/UserController.php:307 +#: ../../../../application/controllers/UserController.php:313 #, php-format msgid "Show user %s" msgstr "Zeige Benutzer %s" @@ -3210,7 +3219,7 @@ msgstr "Ressource aktualisieren" msgid "Update Role" msgstr "Rolle aktualisieren" -#: ../../../../application/controllers/UserController.php:204 +#: ../../../../application/controllers/UserController.php:210 msgid "Update User" msgstr "Benutzer aktualisieren" @@ -3255,7 +3264,7 @@ msgid "Use the following timezone for dates and times" msgstr "Die folgende Zeitzone für Datums- und Zeitangaben verwenden" #: ../../../../application/forms/Config/Resource/SshResourceForm.php:45 -#: ../../../../application/controllers/UserController.php:308 +#: ../../../../application/controllers/UserController.php:314 msgid "User" msgstr "Benutzer" @@ -3274,10 +3283,10 @@ msgstr "Der Benutzer \"%s\" wurde entfernt" msgid "User \"%s\" has been removed from group \"%s\"" msgstr "Der Benutzer \"%s\" wurde aus der Gruppe \"%s\" entfernt" -#: ../../../../application/controllers/UserController.php:104 -#: ../../../../application/controllers/UserController.php:201 -#: ../../../../application/controllers/UserController.php:223 -#: ../../../../application/controllers/UserController.php:239 +#: ../../../../application/controllers/UserController.php:105 +#: ../../../../application/controllers/UserController.php:207 +#: ../../../../application/controllers/UserController.php:229 +#: ../../../../application/controllers/UserController.php:245 #, php-format msgid "User \"%s\" not found" msgstr "Der Benutzer \"%s\" wurde nicht gefunden" @@ -3288,7 +3297,7 @@ msgid "User %s is already a member of all groups" msgstr "Der Benutzer %s ist bereits Mitglied in allen Gruppen" #: ../../../../application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:77 -#: ../../../../application/controllers/UserController.php:57 +#: ../../../../application/controllers/UserController.php:58 msgid "User Backend" msgstr "Benutzerbackend" @@ -3297,7 +3306,7 @@ msgid "User Backends" msgstr "Benutzerbackends" #: ../../../../application/controllers/GroupController.php:80 -#: ../../../../application/controllers/UserController.php:116 +#: ../../../../application/controllers/UserController.php:117 #: ../../../../application/views/scripts/group/list.phtml:50 #: ../../../../library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:573 #: ../../../../library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:118 @@ -3315,7 +3324,7 @@ msgstr "Benutzergruppenbackends" #: ../../../../application/controllers/GroupController.php:26 #: ../../../../application/controllers/GroupController.php:395 -#: ../../../../application/controllers/UserController.php:346 +#: ../../../../application/controllers/UserController.php:352 #: ../../../../application/controllers/RoleController.php:134 msgid "User Groups" msgstr "Benutzergruppen" @@ -3386,7 +3395,7 @@ msgstr "" #: ../../../../application/forms/Config/User/UserForm.php:33 #: ../../../../application/forms/Authentication/LoginForm.php:48 #: ../../../../application/controllers/GroupController.php:116 -#: ../../../../application/controllers/UserController.php:79 +#: ../../../../application/controllers/UserController.php:80 #: ../../../../application/views/scripts/group/show.phtml:75 #: ../../../../application/views/scripts/user/list.phtml:51 #: ../../../../library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:572 @@ -3402,8 +3411,8 @@ msgstr "Benutzername" #: ../../../../application/forms/Config/UserGroup/AddMemberForm.php:118 #: ../../../../application/forms/Navigation/NavigationConfigForm.php:605 #: ../../../../application/controllers/GroupController.php:387 -#: ../../../../application/controllers/UserController.php:25 -#: ../../../../application/controllers/UserController.php:338 +#: ../../../../application/controllers/UserController.php:26 +#: ../../../../application/controllers/UserController.php:344 #: ../../../../application/controllers/RoleController.php:126 #: ../../../../application/views/scripts/role/list.phtml:23 msgid "Users" @@ -3529,7 +3538,7 @@ msgstr "Sie haben noch kein Navigationselement angelegt." msgid "You don't have file-system permissions to write to the file" msgstr "Sie haben keine Schreibrechte auf diese Datei" -#: ../../../../application/controllers/UserController.php:245 +#: ../../../../application/controllers/UserController.php:251 msgid "" "You'll need to configure at least one user group backend first that allows " "to create new memberships" From 564fb8c3200ed09bb0708facfb438d163c60aabf Mon Sep 17 00:00:00 2001 From: Philipp Dorschner Date: Wed, 25 Sep 2019 15:04:54 +0200 Subject: [PATCH 5/6] Only show edit role link if user has the appropriate permission --- application/controllers/UserController.php | 1 + application/views/scripts/user/show.phtml | 37 ++++++++++++---------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php index 5a5b3c754..c10b19b53 100644 --- a/application/controllers/UserController.php +++ b/application/controllers/UserController.php @@ -170,6 +170,7 @@ class UserController extends AuthBackendController $admissionLoader = new AdmissionLoader(); $admissionLoader->applyRoles($userObj); $this->view->userObj = $userObj; + $this->view->allowedToEditRoles = $this->hasPermission('config/authentication/roles/edit'); } /** diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml index aaeffd51e..af54912d2 100644 --- a/application/views/scripts/user/show.phtml +++ b/application/views/scripts/user/show.phtml @@ -43,22 +43,27 @@ use Icinga\Data\Selectable; translate('Role Memberships'); ?> - getRoles(); ?> - -
    - -
  • qlink( - $role->getName(), - 'role/edit', - ['role' => $role->getName()], - ['title' => sprintf($this->translate('Edit role %s'), $role->getName())] - ) ?> -
    • - -
- -

translate('No memberships found'); ?>

- + getRoles(); ?> + +
    + +
  • + allowedToEditRoles): ?> + qlink( + $role->getName(), + 'role/edit', + ['role' => $role->getName()], + ['title' => sprintf($this->translate('Edit role %s'), $role->getName())] + ) ?> + + getName() ?> + +
    • + +
+ +

translate('No memberships found'); ?>

+ From aac860b118d5ffbde1045483e708015ec84afe90 Mon Sep 17 00:00:00 2001 From: Philipp Dorschner Date: Thu, 9 Apr 2020 15:04:10 +0200 Subject: [PATCH 6/6] update PR based on the feedback --- application/views/scripts/user/show.phtml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml index af54912d2..543e667fa 100644 --- a/application/views/scripts/user/show.phtml +++ b/application/views/scripts/user/show.phtml @@ -43,10 +43,10 @@ use Icinga\Data\Selectable; translate('Role Memberships'); ?> - getRoles(); ?> - + getRoles(); ?> +
    - +
  • allowedToEditRoles): ?> qlink( @@ -54,7 +54,8 @@ use Icinga\Data\Selectable; 'role/edit', ['role' => $role->getName()], ['title' => sprintf($this->translate('Edit role %s'), $role->getName())] - ) ?> + ); + $role === end($roles) ? print '' : print ', '; ?> getName() ?>