Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 05:44:24 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into features/household

Browse Source
This commit is contained in:
Julien Fastré 2021-06-02 16:28:24 +02:00
commit edb8aa1dfe
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
View File

@ -117,7 +117,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
private function getWhereClauseForPerson(Person $person) private function getWhereClauseForPerson(Person $person)
{ {
$parameters = []; $parameters = [];
$metadataActivity = $this->em->getClassMetadata('ChillActivityBundle:Activity'); $metadataActivity = $this->em->getClassMetadata(Activity::class);
$associationMapping = $metadataActivity->getAssociationMapping('person'); $associationMapping = $metadataActivity->getAssociationMapping('person');
$role = new Role('CHILL_ACTIVITY_SEE'); $role = new Role('CHILL_ACTIVITY_SEE');
$reachableScopes = $this->helper->getReachableScopes($this->user, $reachableScopes = $this->helper->getReachableScopes($this->user,
@ -154,8 +154,8 @@ class TimelineActivityProvider implements TimelineProviderInterface
private function getFromClausePerson() private function getFromClausePerson()
{ {
$metadataActivity = $this->em->getClassMetadata('ChillActivityBundle:Activity'); $metadataActivity = $this->em->getClassMetadata(Activity::class);
$metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person'); $metadataPerson = $this->em->getClassMetadata(Person::class);
$associationMapping = $metadataActivity->getAssociationMapping('person'); $associationMapping = $metadataActivity->getAssociationMapping('person');
return $metadataActivity->getTableName().' JOIN ' return $metadataActivity->getTableName().' JOIN '
@ -173,7 +173,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
*/ */
public function getEntities(array $ids) public function getEntities(array $ids)
{ {
$activities = $this->em->getRepository('ChillActivityBundle:Activity') $activities = $this->em->getRepository(Activity::class)
->findBy(array('id' => $ids)); ->findBy(array('id' => $ids));
$result = array(); $result = array();

1
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -179,6 +179,7 @@ See accompanying periods: Voir les périodes d'accompagnement
See accompanying period: Voir cette période d'accompagnement See accompanying period: Voir cette période d'accompagnement
Referrer: Référent Referrer: Référent
Participants: Personnes impliquées
# pickAPersonType # pickAPersonType
Pick a person: Choisir une personne Pick a person: Choisir une personne