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

Merge branch 'hotfix_individu_sans_etablissement_assistance'

parents dc062cef 28eb8c21

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line 
Journal des modifications

=========================

2.2.2

-----

- Ajout de l'utilisation du module auth-token pour la gestion des rapporteurs 



2.2.1

-----

composer.json

+9 −2
Original line number Diff line number Diff line
@@ -20,10 +20,15 @@ 
        "ext-intl":                      "*",

        "ext-json":                      "*",

        "ext-readline":                  "*",

        "ext-saxonc":                    "*",

        "ext-soap":                      "*",

        "ext-xmlwriter":                 "*",

        "ext-xsl":                       "*",

        "ext-zip":                       "*",

        "beberlei/assert":               "^2.9",

        "guzzlehttp/guzzle":             "^6.3",

        "ramsey/uuid":                   "^3.3",

        "twig/twig":                     "^3.0",

        "unicaen/app":                   "^3.1",

        "unicaen/auth":                  "^3.2",

        "unicaen/auth-token":            "dev-master",
@@ -34,14 +39,16 @@ 
        "unicaen/ldap":                  "^3.0",

        "unicaen/oracle":                "^3.0",

        "webmozart/assert":              "^1.3",

        "zendframework/zend-feed":       "^2.12"

        "zendframework/zend-feed":       "^2.12",

        "zendframework/zend-soap":       "^2.8"

    },

    "autoload": {

        "psr-0": {

            "Application\\": "module/Application/src",

            "Retraitement\\": "module/Retraitement/src",

            "Notification\\": "module/Notification/src",

            "Import\\": "module/Import/src"

            "Import\\": "module/Import/src",

            "StepStar\\": "module/StepStar/src"

        }

    },

    "autoload-dev": {

config/application.config.php

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ $modules = ['Zend\Cache', 
    'Soutenance',

    'Notification',

    'Information',

    'StepStar',

    'Application',

];

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

+2 −1
Original line number Diff line number Diff line
@@ -238,7 +238,8 @@ EOS 
        /** @var Role $role */

        $role = $this->userContextService->getSelectedIdentityRole();

        if ($role !== null && $structure = $role->getStructure()) {

            return $this->etablissementService->getRepository()->findByStructureId($structure->getId());

            $etablissement =  $this->etablissementService->getRepository()->findByStructureId($structure->getId());

            if ($etablissement) return $etablissement;

        }



        return $this->etablissementService->getRepository()->findOneForUserWrapper($userWrapper);

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

+20 −4
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ class Etablissement 
    protected $doctorants;

    protected $roles;



    /**

     * @var string

     */

    protected $code;



    /**

     * @var Structure

     */
@@ -83,12 +88,23 @@ class Etablissement 
    }



    /**

     * Retourne le code de cet établissement, ex: 0761904GE' pour l'Université de Rouen.

     *

     * @return string

     * @see StructureConcreteInterface

     */

    public function getCode()

    public function getCode(): string

    {

        return $this->code;

    }



    /**

     * @param string $code

     * @return self

     */

    public function setCode(string $code): self

    {

        return $this->getStructure()->getCode();

        $this->code = $code;

        return $this;

    }



    /**
@@ -311,7 +327,7 @@ class Etablissement 
     */

    public function estToutEtablissementConfondu()

    {

        return $this->getCode() === self::CODE_TOUT_ETABLISSEMENT_CONFONDU;

        return $this->getStructure()->getCode() === self::CODE_TOUT_ETABLISSEMENT_CONFONDU;

    }



    /**