Commit 69dab46f authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge remote-tracking branch 'origin/kusanagi' into connor-fix-avenant

parents ab45cd06 18cf9a0c

doc/versions/version-2.15-kusanagi.md

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ curl -fsSL https://deb.nodesource.com/setup_22.x | sudo bash - 
sudo apt-get install -y nodejs



# EDIT

url -fsSL https://deb.nodesource.com/setup_22.x  > setup_22.x.sh 

curl -fsSL https://deb.nodesource.com/setup_22.x  > setup_22.x.sh 

sudo bash setup_22.x.sh



# installation de Yarn (gestionnaire de dépendance node)

module/Oscar/src/Oscar/Entity/Role.php

+4 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ class Role extends AbstractRole implements HierarchicalRoleInterface 
     * @var boolean

     * @ORM\Column(name="displayed", type="boolean", nullable=false, options={"default"=true})

     */

    protected bool $displayed = false;

    protected bool $displayed = true;





    /**
@@ -579,7 +579,9 @@ class Role extends AbstractRole implements HierarchicalRoleInterface 


    public function isDisplayed(): bool

    {

        return $this->displayed;

        // PATCH (Déterminer pourquoi ce paramètre a une influence autre que sur l'affichage)

        //return $this->displayed;

        return true;

    }



    public function setDisplayed(bool $accessibleExterieur): void