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

# Conflicts:
#	module/Application/config/administration.config.php

module/Application/config/administration.config.php

@@ -80,7 +80,7 @@ return [
                         Privileges::ETAT_SORTIE_ADMINISTRATION_VISUALISATION,
                         Privileges::TYPE_INTERVENTION_VISUALISATION,
                         Privileges::MODULATEUR_VISUALISATION,
-                        Privileges::ODF_TYPES_DIPLOME_VISUALISATION,
+                        Privileges::ODF_GRANDS_TYPES_DIPLOME_VISUALISATION,
                     ],
                     'assertion'  => Assertion\GestionAssertion::class,
                 ],

module/Application/config/groupe-type-formation.config.php

@@ -98,12 +98,12 @@ return [
                 [
                     'controller' => 'Application\Controller\GroupeTypeFormation',
                     'action'     => ['index'],
-                    'privileges' => Privileges::ODF_TYPES_DIPLOME_EDITION,
+                    'privileges' => Privileges::ODF_GRANDS_TYPES_DIPLOME_VISUALISATION,
                 ],
                 [
                     'controller' => 'Application\Controller\GroupeTypeFormation',
                     'action'     => ['saisie', 'delete', 'type-formation-saisie', 'type-formation-delete'],
-                    'privileges' => Privileges::ODF_TYPES_DIPLOME_EDITION,
+                    'privileges' => Privileges::ODF_GRANDS_TYPES_DIPLOME_EDITION,
                 ],
             ],
         ],

module/Application/view/application/groupe-type-formation/index.phtml

@@ -12,7 +12,7 @@ use Application\Provider\Privilege\Privileges;
 
 $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>