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

Merge branch 'release_1.3.2' of git.unicaen.fr:open-source/sygal into release_1.3.2

parents fac17188 e12a1d7a

data/SQL/profil.sql

+1 −1
Changes for data/SQL/profil.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ create table PROFIL_TO_ROLE ( 
-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (1, 'Unité de recherche', 'UR', 3, null);

-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (2, 'École doctorale', 'ED', 2, null);

-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (3, 'Administrateur', 'ADMIN', 1, 'Administrateur d''établissement');

-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (4, 'Maison des doctorats', 'BDD', 1, null);

-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (4, 'Maison du doctorat', 'BDD', 1, null);

-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (5, 'Bibliothèque universitaire', 'BU', 1, null);

INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (6, 'Administrateur technique', 'ADMIN_TECH', null, null);

INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (7, 'Doctorant', 'DOCTORANT', null, null);

module/Application/language/en_US.po

+1 −1
Changes for module/Application/language/en_US.po: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ msgid "Bibliothèque universitaire" 
msgstr "University Library"



#: module/Application/view/application/utilisateur/index.phtml:180

msgid "Maison des doctorats"

msgid "Maison du doctorat"

msgstr "Doctorate Office"



#: module/Application/view/application/utilisateur/index.phtml:181

module/Application/src/Application/Controller/IndexController.php

+1 −1
Changes for module/Application/src/Application/Controller/IndexController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ EOS 
            $vm->setTemplate('application/index/partial/ur');

        }

        /**

         * Profil "Maison des doctorats".

         * Profil "Maison du doctorat".

         */

        elseif ($role = $this->userContextService->getSelectedRoleBDD()) {

            $vm->setTemplate('application/index/partial/bdd');

module/Application/src/Application/Entity/Db/Role.php

+1 −1
Changes for module/Application/src/Application/Entity/Db/Role.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class Role extends AbstractRole implements SourceAwareInterface, HistoriqueAware 


    // @todo NB: maintenant il y le code étab concaténé au "role_id"

    const ROLE_ID_DOCTORANT = "Doctorant";

    const ROLE_ID_BUREAU_DES_DOCTORATS = "Maison des doctorats";

    const ROLE_ID_BUREAU_DES_DOCTORATS = "Maison du doctorat";

    const ROLE_ID_BIBLIO_UNIV = "Bibliothèque universitaire";



    const ROLE_ID_ECOLE_DOCT = "École doctorale";

module/Application/src/Application/Notification/ValidationDepotTheseCorrigeeNotification.php

+1 −1
Changes for module/Application/src/Application/Notification/ValidationDepotTheseCorrigeeNotification.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ class ValidationDepotTheseCorrigeeNotification extends Notification 
        $cc = $this->emailBdd;



        $infoMessage = sprintf(

            "Un mail de notification vient d'être envoyé au(x) directeur(s) de thèse (%s) avec copie à la Maison des doctorats (%s)",

            "Un mail de notification vient d'être envoyé au(x) directeur(s) de thèse (%s) avec copie à la Maison du doctorat (%s)",

            implode(',', $to),

            $cc

        );