Commit 190cf6d8 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Fixes

parent 6ca1410e
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for config/merged/utilisateur.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ return [
                    'ajouter-role' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/ajouter-role/:utilisateur',
                            'route' => '/ajouter-role/:utilisateur[/:role]',
                            'defaults' => [
                                'controller' => UtilisateurController::class,
                                'action' => 'ajouter-role',
+3 −2
Changes for src/UnicaenUtilisateur/Controller/UtilisateurController.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ class UtilisateurController extends AbstractActionController

    public function indexAction()
    {
        $roles = $this->roleService->findAll();
        $allRoles = $this->roleService->findAll();
        $roles = $allRoles;
        $userRechercheForm = $this->userRechercheForm;
        $userRoleForm = $this->userRoleForm;
        $userRolePerimetreForm = $this->userRolePerimetreForm;
@@ -139,7 +140,7 @@ class UtilisateurController extends AbstractActionController
        $title = "Gestion des utilisateurs";
        $perimetresEnabled = $this->perimetresEnabled;

        return compact('title', 'utilisateur', 'userRechercheForm', 'userRoleForm', 'userRolePerimetreForm', 'perimetresEnabled');
        return compact('title', 'utilisateur', 'allRoles', 'userRechercheForm', 'userRoleForm', 'userRolePerimetreForm', 'perimetresEnabled');
    }

    public function ajouterAction()
+2 −2
Changes for src/UnicaenUtilisateur/Provider/Identity/IdentityService.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class IdentityService
        if (!empty($this->identityProviders)) {
            foreach ($this->identityProviders as $identityProvider) {
                $computed = $identityProvider->computeRolesAutomatiques($user);
                $rolesAuto = array_merge($rolesAuto, $computed);
                $rolesAuto = array_merge($rolesAuto??[], $computed??[]);
            }
        }

@@ -53,7 +53,7 @@ class IdentityService
        if (!empty($this->identityProviders) && $role->isAuto()) {
            foreach ($this->identityProviders as $identityProvider) {
                $computed = $identityProvider->computeUsersAutomatiques($role->getRoleId());
                $usersAuto = array_merge($usersAuto, $computed);
                $usersAuto = array_merge($usersAuto??[], $computed??[]);
            }
        }