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

Merging

parents 99121293 c449f17a

doc/sql/001_db_tables.sql

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ create table unicaen_utilisateur_role 
    libelle varchar(200) not null,

    role_id varchar(64) not null,

    is_default boolean default false not null,

    is_auto boolean default false not null,

    ldap_filter varchar(35) default NULL::character varying,

    parent_id integer

);

src/UnicaenUtilisateur/Entity/Db/Mapping/UnicaenUtilisateur.Entity.Db.Role.dcm.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    </many-to-many>



    <many-to-many field="privilege" target-entity="UnicaenPrivilege\Entity\Db\Privilege" inversed-by="role" fetch="LAZY">

      <join-table name="unicaen_utilisateur_privilege_linker">

      <join-table name="unicaen_privilege_privilege_role_linker">

        <join-columns>

          <join-column name="role_id" referenced-column-name="id"/>

        </join-columns>

src/UnicaenUtilisateur/Entity/Db/Role.php

+5 −0
Original line number Diff line number Diff line
@@ -112,5 +112,10 @@ class Role extends AbstractRole 
        return $this;

    }



    public function getAccessibleExterieur() : bool

    {

        return true;

    }

    

}

view/unicaen-utilisateur/role/index.phtml

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ $canEffacer = $this->isAllowed(RolePrivileges::getResourceId(RolePrivileges: 


<?php echo $this->messenger()->addMessagesFromFlashMessenger(); ?>



<div class="main">



    <?php if ($canAjouter): ?>

    <a  <?php /** @see RoleController::ajouterAction() */ ?>
@@ -104,7 +103,6 @@ $canEffacer = $this->isAllowed(RolePrivileges::getResourceId(RolePrivileges: 
            <?php endforeach; ?>

        </tbody>

    </table>

</div>



<script>

    $(function() {

view/unicaen-utilisateur/utilisateur/index.phtml

+0 −3
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ $canCreerLocal = $canAjouter; 


<?php echo $this->messenger()->addMessagesFromFlashMessenger(); ?>



<div class="main">



    <div class="row">

    <?php if ($canListing) : ?>

    <a  <?php /** @see UtilisateurController::listingAction() */ ?>
@@ -181,7 +179,6 @@ $canCreerLocal = $canAjouter; 
    </div>

<?php endif; ?>



</div>



<script>

    $(function() {