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

Merge branch 'release_5.2.11' of git.unicaen.fr:open-source/sygal into release_5.2.11

parents 110cd96b 82558a65

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
        "post-install-cmd": [

            "mkdir -p public/unicaen && cp -r vendor/unicaen/app/public/unicaen public/",

            "mkdir -p public/unicaen && cp -r vendor/unicaen/db-import/public/unicaen public/",

            "mkdir -p public/unicaen && cp -r module/UnicaenIdref/public/unicaen public/",

            "mkdir -p public/unicaen && cp -r vendor/unicaen/idref/public/unicaen public/",

            "mkdir -p vendor/mpdf/mpdf/ttfontdata && chmod -R 777 vendor/mpdf/mpdf/ttfontdata"

        ]

    },

composer.lock

+8 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "4d2d7ae4851a045662ffe993c5f59eb2",

    "content-hash": "a6135d91452ea481df28158c8fc6f698",

    "packages": [

        {

            "name": "aws/aws-crt-php",
@@ -9879,7 +9879,7 @@ 
            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/idref.git",

                "reference": "3aada6c252d9fce97329bf135347c7681803b1be"

                "reference": "79928b667cafcc2da61161d2a3a9a1fa36e78b03"

            },

            "require": {

                "laminas/laminas-dependency-plugin": "^2.1",
@@ -9903,8 +9903,13 @@ 
                    "./Module.php"

                ]

            },

            "scripts": {

                "post-install-cmd": [

                    "mkdir -p public/unicaen && cp -r vendor/unicaen/idref/public/unicaen public/"

                ]

            },

            "description": "Module d'interrogation des autorités Sudoc (IDRef)",

            "time": "2023-04-03T19:45:59+00:00"

            "time": "2023-04-06T10:55:00+00:00"

        },

        {

            "name": "unicaen/ldap",

config/application.config.php

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ return [ 
//        'UnicaenDbAnonym',

        'UnicaenDbImport',

        'UnicaenFaq',

        'UnicaenIdref',

//        'UnicaenLivelog',

        'UnicaenPdf',

        'UnicaenRenderer',
@@ -56,7 +57,6 @@ return [ 
        'Information',

        'Doctorant',

        'StepStar',

        'UnicaenIdref',

        'Application',

    ],

    'module_listener_options' => [

module/Application/src/Application/View/Renderer/PhpRenderer.php

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ use Depot\View\Helper\Workflow\WorkflowHelper; 
use Depot\View\Helper\Workflow\WorkflowStepHelper;

use UnicaenApp\Message\View\Helper\MessageHelper;

use UnicaenApp\View\Helper\AppInfos;

use UnicaenIdref\View\Helper\IdrefLinkViewHelper;



/**

 * Description of PhpRenderer
@@ -156,6 +157,8 @@ use UnicaenApp\View\Helper\AppInfos; 
 *

 * @method ActualiteViewHelper actualite()

 *

 * @method IdrefLinkViewHelper idrefLink(string $ppn)

 *

 * @author UnicaenCode

 */

class PhpRenderer extends \Laminas\View\Renderer\PhpRenderer {

module/Application/view/application/ecole-doctorale/information.phtml

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ $structure = $ecole->getStructure(); 
                    <dt>IdRef :</dt>

                    <dd>

                        <?php if ($ecole->getStructure()->getIdRef() !== null AND trim($ecole->getStructure()->getIdRef()) !== "") : ?>

                            <?php echo $ecole->getStructure()->getIdRef(); ?>

                            <?php echo $this->idrefLink($ecole->getStructure()->getIdRef()); ?>

                        <?php else : ?>

                            (Non renseigné)

                        <?php endif; ?>