Commit 39a3de3d authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'hotfix_rdvbu'

parents 99fb5be3 51f3681f

module/Application/src/Application/Controller/TheseController.php

+3 −0
Original line number Diff line number Diff line
@@ -505,6 +505,8 @@ class TheseController extends AbstractController 
        $validationsPdc = $this->validationService->getRepository()->findValidationByCodeAndThese(TypeValidation::CODE_PAGE_DE_COUVERTURE, $these);

        $pageCouvValidee = !empty($validationsPdc);



        $isExemplPapierFourniPertinent = $this->theseService->isExemplPapierFourniPertinent($these);



        $view = new ViewModel([

            'these'        => $these,

            'diffusion'    => $these->getDiffusionForVersion($version),
@@ -523,6 +525,7 @@ class TheseController extends AbstractController 
            'hasVD' => $hasVD,

            'pageCouvValidee' => $pageCouvValidee,

            'asynchronous' => $asynchronous,

            'isExemplPapierFourniPertinent' => $isExemplPapierFourniPertinent,



        ]);

module/Application/src/Application/Form/MetadonneeTheseForm.php

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ class MetadonneeTheseForm extends Form implements InputFilterProviderInterface 
            'type'       => 'Textarea',

            'name'       => $name = 'resume',

            'options'    => [

                'label' => "Resumé en <u>français</u> (" . ($ml = $this->resumeMaxlength[$name]) . " caractères maximum, espaces compris)",

                'label' => "Résumé en <u>français</u> (" . ($ml = $this->resumeMaxlength[$name]) . " caractères maximum, espaces compris)",

                'label_options' => [

                    'disable_html_escape' => true,

                ]
@@ -100,7 +100,7 @@ class MetadonneeTheseForm extends Form implements InputFilterProviderInterface 
            'type'       => 'Textarea',

            'name'       => $name = 'resumeAnglais',

            'options'    => [

                'label' => "Resumé en <u>anglais</u> (" . ($ml = $this->resumeMaxlength[$name]) . " caractères maximum, espaces compris)",

                'label' => "Résumé en <u>anglais</u> (" . ($ml = $this->resumeMaxlength[$name]) . " caractères maximum, espaces compris)",

                'label_options' => [

                    'disable_html_escape' => true,

                ]

module/Application/view/application/these/attestation.phtml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ $canEdit = $this->isAllowed($these, $privilege); 
<div class="box panel panel-info">



    <div class="panel-heading">

        <h2>Attestations</h2>

        <h2>Attestation</h2>

    </div>



    <div class="panel-body">

module/Application/view/application/these/modifier-description.phtml

+3 −0
Original line number Diff line number Diff line 
<?php



use Application\Controller\TheseController;

use Application\Entity\Db\These;

use Application\Provider\Privilege\ThesePrivileges;

use Application\View\Renderer\PhpRenderer;
@@ -12,6 +13,8 @@ use Zend\Form\Form; 
 * @var Form   $form

 *

 * @method string formControlGroup()

 *

 * @see TheseController::modifierDescriptionAction()

 */



$canEdit = true;

module/Application/view/application/these/partial/rdv-bu.phtml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ $ddPageCouv = $pageCouvValidee ? $checked : $unchecked; 
    <?php $class = ($ok = $rdvBu->getConventionMelSignee()) ? '' : 'text-danger' ?>

    <dd class="<?php echo $class ?>"><?php echo $ok ? $checked : $unchecked ?></dd>



    <?php if ($isExemplPapierFourniPertinent): ?>

    <?php if ($isExemplPapierFourniPertinent || $rdvBu->getExemplPapierFourni()): ?>

    <dt>Exemplaire papier fourni :</dt>

    <?php $class = ($ok = $rdvBu->getExemplPapierFourni()) ? '' : 'text-danger' ?>

    <dd class="<?php echo $class ?>"><?php echo $ok ? $checked : $unchecked ?></dd>