Commit e17416ca authored by Thibaut Vallee's avatar Thibaut Vallee
Browse files

correction du pb de mdp sur local user

parent 5be3544b

src/UnicaenUtilisateur/Controller/UtilisateurController.php

+6 −3
Original line number Diff line number Diff line
@@ -103,11 +103,14 @@ class UtilisateurController extends AbstractActionController 
        }



        $utilisateurId = $this->params()->fromQuery("id");

        $utilisateur = null;

        $rolesAttributes = [];

        $rolesDisponibles = [];

        if ($utilisateurId !== null AND $utilisateurId !== "") {

            $utilisateur = $this->userService->find($utilisateurId);

            if($utilisateur instanceof UserInterface) {

                $rolesAttribues = $utilisateur->getRoles()->toArray();

                $rolesDisponibles = array_diff($roles, $rolesAttribues);

                $rolesAttributes = $utilisateur->getRoles()->toArray();

                $rolesDisponibles = array_diff($roles, $rolesAttributes);

            }

        }
@@ -117,7 +120,7 @@ class UtilisateurController extends AbstractActionController 
            'form' => $form,

            'utilisateur' => $utilisateur,

            'roles' => $roles,

            'rolesAttribues' => $rolesAttribues,

            'rolesAttributes' => $rolesAttributes,

            'rolesDisponibles' => $rolesDisponibles,

            'rolesAutomatiques' => ($this->identityProvider !== null) ? $this->identityProvider->computeRolesAutomatiques($utilisateur) : [],

        ]);

src/UnicaenUtilisateur/Form/User/UserForm.php

+5 −5
Original line number Diff line number Diff line
@@ -69,10 +69,10 @@ class UserForm extends Form 
            ],

        ]);



        //password1

        //password

        $this->add([

            'type' => Password::class,

            'name' => 'password1',

            'name' => 'password',

            'options' => [

                'label' => "Mot de passe :",

                'label_attributes' => [
@@ -80,7 +80,7 @@ class UserForm extends Form 
                ],

            ],

            'attributes' => [

                'id' => 'password1',

                'id' => 'password',

            ],

        ]);
@@ -183,7 +183,7 @@ class UserForm extends Form 
                ],

            ],



            'password1'     => [ 

            'password'     => [

                'required' => true,

                'validators' => [

                    [
@@ -220,7 +220,7 @@ class UserForm extends Form 
                            'break_chain_on_failure' => true,

                        ],

                    ],

                    new Identical('password1'),

                    new Identical('password'),

                ],

            ],

        ]));

view/unicaen-utilisateur/utilisateur/index.phtml

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ use UnicaenApp\Form\Element\SearchAndSelect; 
 * @var UserInterface $utilisateur

 * @var RoleInterface[] $roles

 * @var RoleInterface[] $rolesAutomatiques

 * @var RoleInterface[] $rolesAttribues

 * @var RoleInterface[] $rolesAttributes

 * @var RoleInterface[] $rolesDisponibles

 */
@@ -210,11 +210,11 @@ $canCreerLocal = $canAjouter; 
                <?php foreach ($roles as $role) : ?>

                    <div class="role <?php echo $canRole ? 'cliquable remove-role' : ''; ?>"

                         id="<?php echo sprintf('attribue_%s_%s', $utilisateur->getId(), $role->getId()); ?>"

                         style="<?php if (!in_array($role, $rolesAttribues)) echo 'display:none;'; ?>">

                         style="<?php if (!in_array($role, $rolesAttributes)) echo 'display:none;'; ?>">

                        <?php if (!$role->isAuto()): ?>

                            <?php echo $role->getLibelle(); ?>

                            <?php if($canRole): ?>

                                <i class="fas fa-minus text-danger pull-right""></i>

                                <i class="fas fa-minus text-danger pull-right"></i>

                            <?php endif; ?>

                        <?php endif; ?>

                    </div>