Commit 362d7633 authored by Florian Joriot's avatar Florian Joriot
Browse files

Correction post merge

parent c8db3c9f

config/application.config.php

+0 −2
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ class AppConfig 
            'UnicaenSiham',

            'UnicaenVue',

            'Application',

            'Agrement',

            'Intervenant',

            'Service',

            'Enseignement',
@@ -145,7 +144,6 @@ class AppConfig 
            'Plafond',

            'Indicateur',

            'ExportRh',

            'Contrat',

            'Dossier',

        ];

module/Application/config/contrat.config.php

deleted100755 → 0
+0 −0

Empty file deleted.

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

+2 −2
Original line number Diff line number Diff line
@@ -1587,9 +1587,9 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import 
    /**

     * Get IndicModifDossier

     *

     * @return Collection|Mission[]

     * @return Collection|null

     */

    public function getMissions(): Collection

    public function getMissions(): ?Collection

    {

        if (null === $this->missions) {

            return null;

module/Application/view/application/budget/engagements-liquidation.phtml

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ if ($structureElement) { 
            </table>

        </div>

    </div>

    <?php if ($this->isAllowed(\UnicaenAuth\Guard\PrivilegeController::getResourceId('Application\Controller\Budget', 'export'))): ?>

    <?php if ($this->isAllowed(\UnicaenPrivilege\Guard\PrivilegeController::getResourceId('Application\Controller\Budget', 'export'))): ?>

        <div class="budget-export">

            <a href="<?= $this->url('budget/export', ['structure' => $structure->getId()]) ?>">

                <i class="fas fa-download"></i>

module/Contrat/config/module.config.php

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


namespace Contrat;



use Application\Provider\Privilege\Privileges;

use UnicaenPrivilege\Provider\Privilege\Privileges;

use Contrat\Assertion\ContratAssertion;

use Contrat\Controller\ContratController;

use Contrat\Service\ContratServiceListeService;
@@ -196,7 +196,7 @@ return [ 
        ContratController::class => \Contrat\Controller\ContratControllerFactory::class,

    ],

    'services'     => [

        \Contrat\Assertion\ContratAssertion::class         => \UnicaenAuth\Assertion\AssertionFactory::class,

        \Contrat\Assertion\ContratAssertion::class         => \UnicaenPrivilege\Assertion\AssertionFactory::class,

        \Contrat\Service\ContratService::class             => \Contrat\Service\ContratServiceFactory::class,

        \Contrat\Service\TypeContratService::class         => \Contrat\Service\TypeContratServiceFactory::class,

        \Contrat\Processus\ContratProcessus::class         => \Contrat\Processus\ContratProcessusFactory::class,