Commit 4388c2f4 authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branch 'b8.1' of https://git.unicaen.fr/open-source/OSE into types-diplome

# Conflicts:
#	module/Application/config/administration.config.php
parent 76528e12
...@@ -80,7 +80,7 @@ return [ ...@@ -80,7 +80,7 @@ return [
Privileges::ETAT_SORTIE_ADMINISTRATION_VISUALISATION, Privileges::ETAT_SORTIE_ADMINISTRATION_VISUALISATION,
Privileges::TYPE_INTERVENTION_VISUALISATION, Privileges::TYPE_INTERVENTION_VISUALISATION,
Privileges::MODULATEUR_VISUALISATION, Privileges::MODULATEUR_VISUALISATION,
Privileges::ODF_TYPES_DIPLOME_VISUALISATION, Privileges::ODF_GRANDS_TYPES_DIPLOME_VISUALISATION,
], ],
'assertion' => Assertion\GestionAssertion::class, 'assertion' => Assertion\GestionAssertion::class,
], ],
......
...@@ -98,12 +98,12 @@ return [ ...@@ -98,12 +98,12 @@ return [
[ [
'controller' => 'Application\Controller\GroupeTypeFormation', 'controller' => 'Application\Controller\GroupeTypeFormation',
'action' => ['index'], 'action' => ['index'],
'privileges' => Privileges::ODF_TYPES_DIPLOME_EDITION, 'privileges' => Privileges::ODF_GRANDS_TYPES_DIPLOME_VISUALISATION,
], ],
[ [
'controller' => 'Application\Controller\GroupeTypeFormation', 'controller' => 'Application\Controller\GroupeTypeFormation',
'action' => ['saisie', 'delete', 'type-formation-saisie', 'type-formation-delete'], 'action' => ['saisie', 'delete', 'type-formation-saisie', 'type-formation-delete'],
'privileges' => Privileges::ODF_TYPES_DIPLOME_EDITION, 'privileges' => Privileges::ODF_GRANDS_TYPES_DIPLOME_EDITION,
], ],
], ],
], ],
......
...@@ -12,7 +12,7 @@ use Application\Provider\Privilege\Privileges; ...@@ -12,7 +12,7 @@ use Application\Provider\Privilege\Privileges;
$this->headTitle()->append("Formations classées par type"); $this->headTitle()->append("Formations classées par type");
$canEdit = $this->isAllowed(Privileges::getResourceId(Privileges::ODF_TYPES_DIPLOME_EDITION)); $canEdit = $this->isAllowed(Privileges::getResourceId(Privileges::ODF_GRANDS_TYPES_DIPLOME_EDITION));
?> ?>
<h1 class="page-header">Groupe de Types de Formations</h1> <h1 class="page-header">Groupe de Types de Formations</h1>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment