Fix contributions list filter; fixes #1621

diff --git a/galette/lib/Galette/Controllers/Crud/ContributionsController.php b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
index b1e1b1bcc371313f3bb20faa099b137034647add..70a6f6b6c9df31b80f744a1af608f742ebe71d2d 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/ContributionsController.php
+++ b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
@@ -587,6 +587,10 @@ class ContributionsController extends CrudController
                 $filters->show = $post['nbshow'];
             }
 
+            if (isset($post['date_field'])) {
+                $filters->date_field = $post['date_field'];
+            }
+
             if (isset($post['end_date_filter']) || isset($post['start_date_filter'])) {
                 try {
                     if (isset($post['start_date_filter'])) {

diff --git a/galette/templates/default/pages/contributions_list.html.twig b/galette/templates/default/pages/contributions_list.html.twig
index 39e549205b6b46f65f2ef45524260dbdc92d4c73..e92e6dd37b782898a4ba388f45abe7d4ff3e753a 100644 (file)
--- a/galette/templates/default/pages/contributions_list.html.twig
+++ b/galette/templates/default/pages/contributions_list.html.twig
@@ -5,8 +5,8 @@
         <div class="ui segment">
             <div class="four fields">
                 <div class="field">
-                    <label for="date_field_filter">{{ _T("Show contributions by") }}</label>
-                    <select name="date_field_filter" id="date_field_filter" class="ui search dropdown nochosen">
+                    <label for="date_field">{{ _T("Show contributions by") }}</label>
+                    <select name="date_field" id="date_field" class="ui search dropdown nochosen">
                         <option value="{{ constant("Galette\\Filters\\ContributionsList::DATE_BEGIN")}}"{% if filters.date_field == constant('Galette\\Filters\\ContributionsList::DATE_BEGIN') %} selected="selected"{% endif %}>{{ _T("Begin") }}</option>
                         <option value="{{ constant("Galette\\Filters\\ContributionsList::DATE_END") }}"{% if filters.date_field == constant('Galette\\Filters\\ContributionsList::DATE_END') %} selected="selected"{% endif %}>{{ _T("End") }}</option>
                         <option value="{{ constant("Galette\\Filters\\ContributionsList::DATE_RECORD") }}"{% if filters.date_field == constant('Galette\\Filters\\ContributionsList::DATE_RECORD') %} selected="selected"{% endif %}>{{ _T("Record") }}</option>