Commit 681a243b authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'master' of https://git.unicaen.fr/open-source/OSE into ll-v18

parents 3048e788 bdbe4939

data/privileges.php

+2 −0
Changes for data/privileges.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ return [ 
        'privileges' => [

            'visualisation'                => 'Visualisation',

            'edition'                      => 'Édition',

            'administration-visualisation' => 'Administration - Visualisation',

            'administration-edition'       => 'Administration - Édition',

        ],

    ],

module/Application/config/administration.config.php

+1 −1
Changes for module/Application/config/administration.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ return [ 
                        Privileges::MODULATEUR_VISUALISATION,

                        Privileges::DOMAINES_FONCTIONNELS_ADMINISTRATION_VISUALISATION,

                        Privileges::MOTIFS_MODIFICATION_SERVICE_DU_VISUALISATION,

                        Privileges::MOTIF_NON_PAIEMENT_VISUALISATION,

                        Privileges::MOTIF_NON_PAIEMENT_ADMINISTRATION_VISUALISATION,

                        Privileges::ODF_RECONDUCTION_OFFRE,

                        Privileges::ODF_TYPE_FORMATION_VISUALISATION,

                        Privileges::STRUCTURES_ADMINISTRATION_VISUALISATION,

module/Application/config/motif-non-paiement.config.php

+2 −2
Changes for module/Application/config/motif-non-paiement.config.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -73,12 +73,12 @@ return [ 
                [

                    'controller' => 'Application\Controller\MotifNonPaiement',

                    'action'     => ['index'],

                    'privileges' => Privileges::MOTIF_NON_PAIEMENT_VISUALISATION,

                    'privileges' => Privileges::MOTIF_NON_PAIEMENT_ADMINISTRATION_VISUALISATION,

                ],

                [

                    'controller' => 'Application\Controller\MotifNonPaiement',

                    'action'     => ['saisir', 'supprimer'],

                    'privileges' => Privileges::MOTIF_NON_PAIEMENT_EDITION,

                    'privileges' => Privileges::MOTIF_NON_PAIEMENT_ADMINISTRATION_EDITION,

                ],

            ],

        ],

module/Application/src/Form/VolumeHoraire/SaisieCalendaire.php

+2 −0
Changes for module/Application/src/Form/VolumeHoraire/SaisieCalendaire.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ use Application\Service\Traits\TypeInterventionServiceAwareTrait; 
use UnicaenApp\Util;

use Laminas\Form\Element\Hidden;

use Laminas\Hydrator\HydratorInterface;

use UnicaenApp\Service\EntityManagerAwareTrait;





/**

 * Description of SaisieCalendaire

module/Application/src/Provider/Privilege/Privileges.php

+6 −4
Changes for module/Application/src/Provider/Privilege/Privileges.php: 6 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -142,15 +142,15 @@ class Privileges extends \UnicaenAuth\Provider\Privilege\Privileges 
    const INTERVENANT_EXPORTER                            = 'intervenant-exporter';

    const INTERVENANT_FICHE                               = 'intervenant-fiche';

    const INTERVENANT_LIEN_SYSTEME_INFORMATION            = 'intervenant-lien-systeme-information';

    const INTERVENANT_NOTE_ADMINISTRATION                 = 'intervenant-note-administration';

    const INTERVENANT_NOTE_AJOUT                          = 'intervenant-note-ajout';

    const INTERVENANT_NOTE_EMAIL                          = 'intervenant-note-email';

    const INTERVENANT_NOTE_VISUALISATION                  = 'intervenant-note-visualisation';

    const INTERVENANT_RECHERCHE                           = 'intervenant-recherche';

    const INTERVENANT_STATUT_EDITION                      = 'intervenant-statut-edition';

    const INTERVENANT_STATUT_VISUALISATION                = 'intervenant-statut-visualisation';

    const INTERVENANT_SUPPRESSION                         = 'intervenant-suppression';

    const INTERVENANT_VISUALISATION_HISTORISES            = 'intervenant-visualisation-historises';

    const INTERVENANT_NOTE_ADMINISTRATION                     = 'intervenant-note-administration';

    const INTERVENANT_NOTE_AJOUT                              = 'intervenant-note-ajout';

    const INTERVENANT_NOTE_EMAIL                              = 'intervenant-note-email';

    const INTERVENANT_NOTE_VISUALISATION                      = 'intervenant-note-visualisation';

    const MISE_EN_PAIEMENT_DEMANDE                        = 'mise-en-paiement-demande';

    const MISE_EN_PAIEMENT_EDITION                        = 'mise-en-paiement-edition';

    const MISE_EN_PAIEMENT_EXPORT_CSV                     = 'mise-en-paiement-export-csv';
@@ -168,6 +168,8 @@ class Privileges extends \UnicaenAuth\Provider\Privilege\Privileges 
    const MODIF_SERVICE_DU_VISUALISATION                  = 'modif-service-du-visualisation';

    const MODULATEUR_EDITION                              = 'modulateur-edition';

    const MODULATEUR_VISUALISATION                        = 'modulateur-visualisation';

    const MOTIF_NON_PAIEMENT_ADMINISTRATION_EDITION       = 'motif-non-paiement-administration-edition';

    const MOTIF_NON_PAIEMENT_ADMINISTRATION_VISUALISATION = 'motif-non-paiement-administration-visualisation';

    const MOTIF_NON_PAIEMENT_EDITION                      = 'motif-non-paiement-edition';

    const MOTIF_NON_PAIEMENT_VISUALISATION                = 'motif-non-paiement-visualisation';

    const MOTIFS_MODIFICATION_SERVICE_DU_EDITION          = 'motifs-modification-service-du-edition';