Commit 17c0e9e7 authored by David Surville's avatar David Surville
Browse files

Merge branch 'master' of https://git.unicaen.fr/lib/unicaen/privilege

parents 6948ef21 4f49f811

src/UnicaenPrivilege/Entity/Db/Mapping/UnicaenPrivilege.Entity.Db.Privilege.dcm.xml

+2 −2
Changes for src/UnicaenPrivilege/Entity/Db/Mapping/UnicaenPrivilege.Entity.Db.Privilege.dcm.xml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"

                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">

    <entity name="UnicaenPrivilege\Entity\Db\Privilege" table="UNICAEN_PRIVILEGE">

    <entity name="UnicaenPrivilege\Entity\Db\Privilege" table="UNICAEN_PRIVILEGE_PRIVILEGE">



        <indexes>

            <index name="ix_unicaen_privilege_categorie" columns="CATEGORIE_ID"/>
@@ -27,7 +27,7 @@ 
        </many-to-one>



        <many-to-many field="roles" target-entity="UnicaenUtilisateur\Entity\Db\Role" inversed-by="privileges" fetch="LAZY">

            <join-table name="UNICAEN_ROLE_PRIVILEGE_LINKER">

            <join-table name="UNICAEN_PRIVILEGE_PRIVILEGE_ROLE_LINKER">

                <join-columns>

                    <join-column name="PRIVILEGE_ID" referenced-column-name="ID"/>

                </join-columns>

src/UnicaenPrivilege/Service/Privilege/PrivilegeService.php

+2 −1
Changes for src/UnicaenPrivilege/Service/Privilege/PrivilegeService.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ class PrivilegeService extends CommonService implements PrivilegeProviderInterfa 
        }



        try {

            $this->getEntityManager()->flush();

//            $this->getEntityManager()->flush();

            $this->update($privilege);

        } catch (ORMException $e) {

            throw new RuntimeException("Un problème est survenu lors du changement de privilège \"" . $privilege->getLibelle() . "\" pour le rôle \"" . $role->getLibelle() . "\".", $e);

        }