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

Meilleur construction de IdentityProvider

parent e17416ca
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ class UtilisateurController extends AbstractActionController
            }
        }

        $rolesAutomatiques = [];
        foreach ($this->identityProvider as $identityProvider) {
            $rolesAutomatiques = array_merge($rolesAutomatiques, $identityProvider->computeRolesAutomatiques($utilisateur));
        }

        // TODO recupérer le provider qui va bien ...
        return new ViewModel([
            'title' => "Gestion des utilisateurs",
@@ -122,7 +127,7 @@ class UtilisateurController extends AbstractActionController
            'roles' => $roles,
            'rolesAttributes' => $rolesAttributes,
            'rolesDisponibles' => $rolesDisponibles,
            'rolesAutomatiques' => ($this->identityProvider !== null) ? $this->identityProvider->computeRolesAutomatiques($utilisateur) : [],
            'rolesAutomatiques' => $rolesAutomatiques,
        ]);
    }

+3 −2
Original line number Diff line number Diff line
@@ -46,9 +46,10 @@ class UtilisateurControllerFactory
            }
        }

        $identityProvider = null;
        $identityProvider = [];
        if (isset($moduleConfig['identity-provider']) && !empty($moduleConfig['identity-provider'])) {
            $identityProvider = $container->get($moduleConfig['identity-provider']);
            foreach ($moduleConfig['identity-provider'] as $value)
            $identityProvider[]= $container->get($value);
        }

        $controller = new UtilisateurController();
+2 −2
Original line number Diff line number Diff line
@@ -226,16 +226,16 @@ $canCreerLocal = $canAjouter;
                <h3><span class="label label-danger">Rôle manuel disponible</span></h3>

                <?php foreach ($roles as $role) : ?>
                    <?php if (!$role->isAuto()): ?>
                    <div class="role <?php echo $canRole ? 'cliquable add-role' : ''; ?>"
                         id="<?php echo sprintf('disponible_%s_%s', $utilisateur->getId(), $role->getId()); ?>"
                         style="<?php if (!in_array($role, $rolesDisponibles)) echo 'display:none;'; ?>">
                        <?php if (!$role->isAuto()): ?>
                            <?php echo $role->getLibelle(); ?>
                            <?php if($canRole): ?>
                                <i class="fas fa-plus text-success pull-right"></i>
                            <?php endif; ?>
                        <?php endif; ?>
                    </div>
                    <?php endif; ?>
                <?php endforeach; ?>

            </div>