Loading CHANGELOG.md +1 −0 Changes for CHANGELOG.md: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ Journal des modifications 5.2.6 ----- - Déclaration des membres du comite de suivi individuel - Amélioration du message de blocage des modification des structures - [FIX] Plus d'envoi de mail lors du classement des inscriptions si les inscriptions ne sont pas closes 5.2.5 Loading module/Application/view/application/utilisateur/init-compte.phtml +1 −1 Changes for module/Application/view/application/utilisateur/init-compte.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -70,7 +70,7 @@ $this->headTitle("Initialisation du compte utilisateur"); <div class="alert alert-danger"> <p class="lead"> <span class="fas fa-exclamation-triangle"></span> Aucun compte utilisateur ne correspond à ce jeton d'identification. <span class="icon icon-attention"></span> Aucun compte utilisateur ne correspond à ce jeton d'identification. </p> <p> Loading module/Structure/src/Structure/Entity/Db/Structure.php +6 −0 Changes for module/Structure/src/Structure/Entity/Db/Structure.php: 6 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -157,6 +157,12 @@ class Structure implements StructureInterface, HistoriqueAwareInterface, SourceA return count($this->getStructuresSubstituees()) > 0; } public function estSubstituee() : bool { return $this->getStructureSubstituante() !== null; } /** * @return string */ Loading module/Structure/view/structure/ecole-doctorale/modifier.phtml +26 −4 Changes for module/Structure/view/structure/ecole-doctorale/modifier.phtml: 26 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -19,13 +19,14 @@ use Application\View\Renderer\PhpRenderer; /** @var EcoleDoctorale $ecole */ $ecole = $form->getObject(); $isNew = $ecole->getId() === null; $estSubstituante = $ecole->getStructure()->estStructureSubstituante(); $estSubstituee = $ecole->getStructure()->estSubstituee(); $estModifiable = !($ecole->getSource()->getImportable()); $fcg = $this->formControlGroup(); $this->headTitle("Modification de l'école doctorale ".$ecole->getStructure()->getCode()); $editable = $isNew || $estSubstituante; //$form->get('libelle')->setAttribute('readonly', !$editable); //$form->get('sigle')->setAttribute('readonly', !$editable); $editable = $isNew || (!$estSubstituee AND $estModifiable); $form->get('libelle')->setAttribute('readonly', !$editable); $form->get('sigle')->setAttribute('readonly', !$editable); $form->get('code')->setAttribute('readonly', !$editable); ?> Loading @@ -37,6 +38,27 @@ $form->get('code')->setAttribute('readonly', !$editable); <?php endif ?> </h1> <?php if (!$editable) : ?> <div class="alert alert-warning"> <p> <?php if (!$estModifiable) : ?> <span class="icon icon-attention"></span> <strong>La source (<?php echo $ecole->getSource()->getLibelle(); ?>) ne permet pas de modification.</strong> <br/> <?php endif; ?> <?php if ($estSubstituee) : ?> <span class="icon icon-attention"></span> <strong>La structure est substituée et ne doit pas être modifiée.</strong> <br/> <?php endif; ?> </p> <p> Par conséquent, vous ne pouvez pas modifier les champs : libellé, sigle et code. </p> </div> <?php endif; ?> <?php echo $this->form()->openTag($form->prepare()->setAttribute('class', 'ecole-doctorale')) ?> <div class="row"> Loading module/Structure/view/structure/etablissement/modifier.phtml +36 −0 Changes for module/Structure/view/structure/etablissement/modifier.phtml: 36 added lines, 0 removed lines. Original line number Diff line number Diff line <?php use Structure\Controller\EtablissementController; use Structure\Entity\Db\Etablissement; use Structure\Form\EtablissementForm; use Application\View\Renderer\PhpRenderer; Loading @@ -16,8 +17,43 @@ use Application\View\Renderer\PhpRenderer; */ $fcg = $this->formControlGroup(); /** @var Etablissement $etablissement */ $etablissement = $form->getObject(); $idEtablissement = $etablissement->getStructure()->getId(); $isNew = $etablissement->getId() === null; $estSubstituee = $etablissement->getStructure()->estSubstituee(); $estModifiable = !($etablissement->getSource()->getImportable()); $fcg = $this->formControlGroup(); $editable = $isNew || (!$estSubstituee AND $estModifiable); $form->get('libelle')->setAttribute('readonly', !$editable); $form->get('sigle')->setAttribute('readonly', !$editable); $form->get('code')->setAttribute('readonly', !$editable); ?> <?php if (!$editable) : ?> <div class="alert alert-warning"> <p> <?php if (!$estModifiable) : ?> <span class="icon icon-attention"></span> <strong>La source (<?php echo $etablissement->getSource()->getLibelle(); ?>) ne permet pas de modification.</strong> <br/> <?php endif; ?> <?php if ($estSubstituee) : ?> <span class="icon icon-attention"></span> <strong>La structure est substituée et ne doit pas être modifiée.</strong> <br/> <?php endif; ?> </p> <p> Par conséquent, vous ne pouvez pas modifier les champs : libellé, sigle et code. </p> </div> <?php endif; ?> <?php echo $this->form()->openTag($form->prepare()->setAttribute('class', 'etablissement')) ?> <div class="row"> Loading Loading
CHANGELOG.md +1 −0 Changes for CHANGELOG.md: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ Journal des modifications 5.2.6 ----- - Déclaration des membres du comite de suivi individuel - Amélioration du message de blocage des modification des structures - [FIX] Plus d'envoi de mail lors du classement des inscriptions si les inscriptions ne sont pas closes 5.2.5 Loading
module/Application/view/application/utilisateur/init-compte.phtml +1 −1 Changes for module/Application/view/application/utilisateur/init-compte.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -70,7 +70,7 @@ $this->headTitle("Initialisation du compte utilisateur"); <div class="alert alert-danger"> <p class="lead"> <span class="fas fa-exclamation-triangle"></span> Aucun compte utilisateur ne correspond à ce jeton d'identification. <span class="icon icon-attention"></span> Aucun compte utilisateur ne correspond à ce jeton d'identification. </p> <p> Loading
module/Structure/src/Structure/Entity/Db/Structure.php +6 −0 Changes for module/Structure/src/Structure/Entity/Db/Structure.php: 6 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -157,6 +157,12 @@ class Structure implements StructureInterface, HistoriqueAwareInterface, SourceA return count($this->getStructuresSubstituees()) > 0; } public function estSubstituee() : bool { return $this->getStructureSubstituante() !== null; } /** * @return string */ Loading
module/Structure/view/structure/ecole-doctorale/modifier.phtml +26 −4 Changes for module/Structure/view/structure/ecole-doctorale/modifier.phtml: 26 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -19,13 +19,14 @@ use Application\View\Renderer\PhpRenderer; /** @var EcoleDoctorale $ecole */ $ecole = $form->getObject(); $isNew = $ecole->getId() === null; $estSubstituante = $ecole->getStructure()->estStructureSubstituante(); $estSubstituee = $ecole->getStructure()->estSubstituee(); $estModifiable = !($ecole->getSource()->getImportable()); $fcg = $this->formControlGroup(); $this->headTitle("Modification de l'école doctorale ".$ecole->getStructure()->getCode()); $editable = $isNew || $estSubstituante; //$form->get('libelle')->setAttribute('readonly', !$editable); //$form->get('sigle')->setAttribute('readonly', !$editable); $editable = $isNew || (!$estSubstituee AND $estModifiable); $form->get('libelle')->setAttribute('readonly', !$editable); $form->get('sigle')->setAttribute('readonly', !$editable); $form->get('code')->setAttribute('readonly', !$editable); ?> Loading @@ -37,6 +38,27 @@ $form->get('code')->setAttribute('readonly', !$editable); <?php endif ?> </h1> <?php if (!$editable) : ?> <div class="alert alert-warning"> <p> <?php if (!$estModifiable) : ?> <span class="icon icon-attention"></span> <strong>La source (<?php echo $ecole->getSource()->getLibelle(); ?>) ne permet pas de modification.</strong> <br/> <?php endif; ?> <?php if ($estSubstituee) : ?> <span class="icon icon-attention"></span> <strong>La structure est substituée et ne doit pas être modifiée.</strong> <br/> <?php endif; ?> </p> <p> Par conséquent, vous ne pouvez pas modifier les champs : libellé, sigle et code. </p> </div> <?php endif; ?> <?php echo $this->form()->openTag($form->prepare()->setAttribute('class', 'ecole-doctorale')) ?> <div class="row"> Loading
module/Structure/view/structure/etablissement/modifier.phtml +36 −0 Changes for module/Structure/view/structure/etablissement/modifier.phtml: 36 added lines, 0 removed lines. Original line number Diff line number Diff line <?php use Structure\Controller\EtablissementController; use Structure\Entity\Db\Etablissement; use Structure\Form\EtablissementForm; use Application\View\Renderer\PhpRenderer; Loading @@ -16,8 +17,43 @@ use Application\View\Renderer\PhpRenderer; */ $fcg = $this->formControlGroup(); /** @var Etablissement $etablissement */ $etablissement = $form->getObject(); $idEtablissement = $etablissement->getStructure()->getId(); $isNew = $etablissement->getId() === null; $estSubstituee = $etablissement->getStructure()->estSubstituee(); $estModifiable = !($etablissement->getSource()->getImportable()); $fcg = $this->formControlGroup(); $editable = $isNew || (!$estSubstituee AND $estModifiable); $form->get('libelle')->setAttribute('readonly', !$editable); $form->get('sigle')->setAttribute('readonly', !$editable); $form->get('code')->setAttribute('readonly', !$editable); ?> <?php if (!$editable) : ?> <div class="alert alert-warning"> <p> <?php if (!$estModifiable) : ?> <span class="icon icon-attention"></span> <strong>La source (<?php echo $etablissement->getSource()->getLibelle(); ?>) ne permet pas de modification.</strong> <br/> <?php endif; ?> <?php if ($estSubstituee) : ?> <span class="icon icon-attention"></span> <strong>La structure est substituée et ne doit pas être modifiée.</strong> <br/> <?php endif; ?> </p> <p> Par conséquent, vous ne pouvez pas modifier les champs : libellé, sigle et code. </p> </div> <?php endif; ?> <?php echo $this->form()->openTag($form->prepare()->setAttribute('class', 'etablissement')) ?> <div class="row"> Loading