Commit 621e8a8c authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix buf dans la liste des responsables + CSS customisé

parent 2a2d9633

.gitignore

+4 −0
Changes for .gitignore: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ config/autoload/unicaen-auth.local.php 
/logs/*

!/logs/.gitkeep



# custom

/public/custom/*

!/public/custom/.gitkeep



# Data & Cache

data/*

!data/backup_oscar-empty.sql

module/Oscar/src/Oscar/Controller/PersonController.php

+3 −0
Changes for module/Oscar/src/Oscar/Controller/PersonController.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -483,7 +483,10 @@ class PersonController extends AbstractOscarController 
            ->where('r.principal = true')

            ;



        $dbroles =$this->getPersonService()->getRolesByAuthentification();



        return [

            'dbroles' => $dbroles,

            'ldapFilters' => $this->getEntityManager()->getRepository(Person::class)->getRolesLdapUsed(),

            'persons' => new UnicaenDoctrinePaginator($persons, $page)

        ];

module/Oscar/view/layout/layout.phtml

+1 −0
Changes for module/Oscar/view/layout/layout.phtml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ $this->headScript() 
        <link rel="stylesheet" href="<?= $this->basePath() . '/css/app.css' ?>">

        <?php endif;*/ ?>

        <link rel="stylesheet" href="<?= $this->basePath() . '/css/app.css' ?>">

        <link rel="stylesheet" href="<?= $this->basePath() . '/custom/custom.css' ?>">

        <?php /* echo $this->headLink(array(

            'rel'  => 'shortcut icon',

            'type' => 'image/vnd.microsoft.icon',

module/Oscar/view/oscar/person/boss.phtml

+7 −1
Changes for module/Oscar/view/oscar/person/boss.phtml: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -22,7 +22,13 @@ $search = ""; 


    <h3 class="text-center"><?= count($persons) ?> résultat(s) - page <?= $persons->getCurrentPage() ?> / <?= $persons->getCountPage() ?></h3>

    <?php foreach( $persons as $person ): ?>

        <?= $this->partial('/oscar/person/item-list.phtml', ['person' => $person, 'markText' => $markText, 'search' => $search, 'ldapFilters' => $ldapFilters]) ?>

        <?= $this->partial('/oscar/person/item-list.phtml', [

            'person' => $person,

            'markText' => $markText,

            'search' => $search,

            'ldapFilters' => $ldapFilters,

            'dbroles'=> array_key_exists($person->getLadapLogin(), $dbroles) ? $dbroles[$person->getLadapLogin()] : []

        ]) ?>

    <?php endforeach; ?>

public/custom/.gitkeep

0 → 100644
+0 −0

Empty file added.