diff --git a/src/Controller/ActorController.php b/src/Controller/ActorController.php index 6293628..da4a3eb 100644 --- a/src/Controller/ActorController.php +++ b/src/Controller/ActorController.php @@ -153,7 +153,7 @@ // Update fields $actorEditForm->updateFields($actor); - + // Get activities $activities = $activityRepository->findBy([ 'actor' => $actor, diff --git a/src/Enum/StatusEnum.php b/src/Enum/StatusEnum.php index ee0e473..8de06e7 100644 --- a/src/Enum/StatusEnum.php +++ b/src/Enum/StatusEnum.php @@ -18,7 +18,7 @@ /** @var string Actions are planified and nothing is happening before */ public const PLANIFIED = 'planified'; - + /** @var string Activity is postponed */ public const POSTPONED = 'posetponed'; diff --git a/src/Repository/ActivityRepository.php b/src/Repository/ActivityRepository.php index c3cbd06..c569fd0 100644 --- a/src/Repository/ActivityRepository.php +++ b/src/Repository/ActivityRepository.php @@ -49,12 +49,12 @@ public function findActiveFollowed(): array { // Create criteria - $criteria =new Criteria(); + $criteria = new Criteria(); $criteria->andWhere($criteria->expr() ->eq('actor.followed', true)); $criteria->andWhere($criteria->expr() ->in('activity.status', StatusEnum::ACTIVE_STATUS)); - + $query = $this->createQueryBuilder('activity'); $query->join(ActorEntity::class, 'actor', Join::WITH, 'activity.actor = actor'); $query->addCriteria($criteria); diff --git a/src/Repository/ActorRepository.php b/src/Repository/ActorRepository.php index b096534..81d187e 100644 --- a/src/Repository/ActorRepository.php +++ b/src/Repository/ActorRepository.php @@ -30,7 +30,7 @@ } return $this->findBy($critera, ActorRepository::DEFAULT_ORDER); } - + /** * {@inheritdoc} */ @@ -40,7 +40,7 @@ foreach ($this::DEFAULT_ORDER as $field => $order) { $queryBuilder->addOrderBy($alias . '.' . $field, $order); } - + return $queryBuilder; } diff --git a/templates/activity/activity.html.twig b/templates/activity/activity.html.twig index a9996be..cb80f7c 100644 --- a/templates/activity/activity.html.twig +++ b/templates/activity/activity.html.twig @@ -18,7 +18,7 @@
-

Supprimer l'activité

+

Supprimer

{% include '_includes/html/genericForm.html.twig' with {'form': activityDeleteForm, 'data': {activity: activity, variant: 'full'}} only %} diff --git a/templates/actor/actor.html.twig b/templates/actor/actor.html.twig index 9ab025a..0f69c41 100644 --- a/templates/actor/actor.html.twig +++ b/templates/actor/actor.html.twig @@ -18,7 +18,7 @@
-

Supprimer l'acteur

+

Supprimer

{% include '_includes/html/genericForm.html.twig' with {'form': actorDeleteForm, 'data': {actor: actor, variant: 'full'}} only %} diff --git a/templates/actor/actors.html.twig b/templates/actor/actors.html.twig index 518cf6c..539ada2 100644 --- a/templates/actor/actors.html.twig +++ b/templates/actor/actors.html.twig @@ -17,7 +17,7 @@
-

Ajouter un acteur

+

Nouvel acteur

{% include '_includes/html/genericForm.html.twig' with {form: actorAddForm} only %}