Commit 136dfce1 authored by Jean-Baptiste Oellers's avatar Jean-Baptiste Oellers
Browse files

Merge remote-tracking branch 'origin/starling' into kusanagi

parents 389155cd bbde1359

module/Oscar/src/Oscar/Entity/Activity.php

+1 −0
Original line number Diff line number Diff line
@@ -2605,6 +2605,7 @@ class Activity implements ResourceInterface 
        // Info Projet

        $datas['project-label'] = $this->getProject() ? $this->getProject()->getLabel() : '';

        $datas['project-acronym'] = $this->getProject() ? $this->getProject()->getAcronym() : '';

        $datas['project-description'] = $this->getProject() ? $this->getProject()->getDescription() : '';



        $datas['type'] = (string)$this->getActivityType();