From 4c7673f3fdeed86b89506da65c0e6f4a1f54a43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 11 Jan 2019 12:33:05 +0100
Subject: [PATCH] fix bug when extracting activities without filter /
 aggregators introducing persons

---
 CHANGELOG.md                    | 6 ++++++
 Export/Export/CountActivity.php | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88a7e4351..4bbf3ff45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,3 +4,9 @@ Version 1.5.1
 
 - [report activity count] fix error: do not show centers which are not selected in results.
 
+`master branch`
+==============
+
+- [report activity]: add aggregator for activity users
+- fix bug: error when extracting activities without filter / aggregators selecting persons
+
diff --git a/Export/Export/CountActivity.php b/Export/Export/CountActivity.php
index 00f741fce..3498d7a13 100644
--- a/Export/Export/CountActivity.php
+++ b/Export/Export/CountActivity.php
@@ -73,12 +73,9 @@ class CountActivity implements ExportInterface
         
         $qb->select('COUNT(activity.id) as export_count_activity')
                 ->from('ChillActivityBundle:Activity', 'activity')
+                ->join('activity.person', 'person')
                 ;
         
-        if (in_array('person', $requiredModifiers)) {
-            $qb->join('activity.person', 'person');
-        }
-        
         $qb->where($qb->expr()->in('person.center', ':centers'))
             ->setParameter('centers', $centers)
             ;