Use filters for meetings csv/xlsx export

django-daiquiri · Aug 3, 2018 · b24b65f · b24b65f
1 parent b83c743
commit b24b65f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/daiquiri/meetings/templates/meetings/management_export_dropdown.html b/daiquiri/meetings/templates/meetings/management_export_dropdown.html
@@ -9,23 +9,23 @@
     <ul class="dropdown-menu dropdown-menu-right">
 
         <li>
-            <a href="{% url 'meetings:export_participants' meeting_slug 'csv' %}">
-                {% trans 'All participants (csv)' %}
+            <a href="{% url 'meetings:export_participants' meeting_slug 'csv' %}?{$ service.query_param_string $}">
+                {% trans 'Participants (csv)' %}
             </a>
         </li>
         <li>
-            <a href="{% url 'meetings:export_participants' meeting_slug 'xlsx' %}">
-                {% trans 'All participants (xlsx)' %}
+            <a href="{% url 'meetings:export_participants' meeting_slug 'xlsx' %}?{$ service.query_param_string $}">
+                {% trans 'Participants (xlsx)' %}
             </a>
         </li>
         <li>
             <a href="{% url 'meetings:export_abstracts' meeting_slug %}?{$ service.query_param_string $}" target="_blank">
-                {% blocktrans %}Abstracts using filters (html){% endblocktrans %}
+                {% blocktrans %}Abstracts (html){% endblocktrans %}
             </a>
         </li>
         <li>
             <a href="{% url 'meetings:export_emails' meeting_slug %}?{$ service.query_param_string $}" target="_blank">
-                {% blocktrans %}Email addresses using filters (txt){% endblocktrans %}
+                {% blocktrans %}Email addresses (txt){% endblocktrans %}
             </a>
         </li>
     </ul>

diff --git a/daiquiri/meetings/views.py b/daiquiri/meetings/views.py
@@ -218,7 +218,9 @@ def get_rows(self, participants):
 
     def get(self, request, slug, format):
         meeting = self.get_meeting(slug)
-        participants = meeting.participants.all()
+
+        queryset = meeting.participants.all()
+        participants = ParticipantFilterBackend().filter_queryset(request, queryset, self)
 
         if format == 'csv':
             return render_to_csv(request, meeting.title, self.get_columns(), self.get_rows(participants))