Commit 506af793 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-1.4.0' of git.unicaen.fr:open-source/sygal into release-1.4.0

parents 81668bd9 4aa97f81
Loading
Loading
Loading
Loading
+3 −1
Changes for CHANGELOG.md: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
Journal des modifications
=========================

1.4.0 (???????????????????/01/2020)
1.4.0 (??/01/2020)
------------------

### Ajouts
@@ -12,6 +12,8 @@ Journal des modifications
- Nouvelle charte de diffusion téléchargeable.
- Ajout du flag "fermé" pour les structures et utilisations dans la recherche de thèses.
- Ajout d'un champ "Id HAL" dans le formulaire d'autorisation de diffusion.
- Ajout d'un menu dépôt pour séparer les action liés au dépôt de la partie annuaire
- La couverture est maintenant recto/verso lorsque la premiere page n'est pas retirée

1.3.3 (18/12/2019)
------------------
+7 −0
Changes for doc/release-notes/1.4.0/01-schema-1.4.0.sql: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line

--
-- Structure fermée
--

alter table STRUCTURE
    add EST_FERME number(1) default 0 ;

--
-- Id HAL dans le formulaire de diffusion.
--
+1 −1
Changes for module/Application/src/Application/Controller/StructureConcreteController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ abstract class StructureConcreteController extends AbstractController
        $structureId = $this->params()->fromRoute("structure");
        $this->supprimerLogoStructure();

        return $this->redirect()->toRoute($this->routeName, [], ['query' => ['selected' => $structureId], "fragment" => $structureId], true);
        return $this->redirect()->toRoute($this->routeName."/information", [], ['query' => ['selected' => $structureId], "fragment" => $structureId], true);
    }

    /**
+1 −0
Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Structure.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@
        </id>
        <field name="sigle"      type="string" column="SIGLE"       length="32"  nullable="true"/>
        <field name="libelle"    type="string" column="LIBELLE"     length="128" nullable="false"/>
        <field name="ferme"      type="integer" column="EST_FERME"   nullable="false"/>
        <field name="cheminLogo" type="string" column="CHEMIN_LOGO" length="200" nullable="true"/>

        <many-to-one field="typeStructure" target-entity="Application\Entity\Db\TypeStructure">
+18 −0
Changes for module/Application/src/Application/Entity/Db/Structure.php: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -23,11 +23,13 @@ class Structure implements StructureInterface, HistoriqueAwareInterface, SourceA
     * @var string $sigle
     * @var string $libelle
     * @var string $cheminLogo
     * @var integer $cheminLogo
     */
    private     $id;
    protected   $sigle;
    protected   $libelle;
    protected   $cheminLogo;
    protected   $ferme;

    /**
     * @var string
@@ -341,4 +343,20 @@ class Structure implements StructureInterface, HistoriqueAwareInterface, SourceA
    {
        return 'structure';
    }

    /**
     * @return bool
     */
    public function isFerme()
    {
        return $this->ferme === 1;
    }

    /**
     * @param boolean $ferme
     */
    public function setFerme($ferme)
    {
        if (!$ferme) $this->ferme = 0; else $this->ferme = 1;
    }
}
 No newline at end of file
Loading