Do not override members list filters on member display or edit; closes #1803

[galette.git] / galette / lib / Galette / Filters / MembersList.php

diff --git a/galette/lib/Galette/Filters/MembersList.php b/galette/lib/Galette/Filters/MembersList.php
index ad628ba70967c6f447edb0b6756c772699246e91..b95759dfd2ba1e09cc1639b610434dde18809dd0 100644 (file)
--- a/galette/lib/Galette/Filters/MembersList.php
+++ b/galette/lib/Galette/Filters/MembersList.php
@@ -38,6 +38,7 @@ namespace Galette\Filters;
 
 use Analog\Analog;
 use Galette\Core\Pagination;
+use Galette\Core\Preferences;
 use Galette\Entity\Group;
 use Galette\Repository\Members;
 
@@ -54,10 +55,10 @@ use Galette\Repository\Members;
  * @link      http://galette.tuxfamily.org
  *
  * @property string $filter_str
- * @property string $field_filter
- * @property string $membership_filter
+ * @property integer $field_filter
+ * @property integer $membership_filter
  * @property integer $filter_account
- * @property string $email_filter
+ * @property integer $email_filter
  * @property integer $group_filter
  * @property array $selected
  * @property array $unreachable
@@ -102,7 +103,7 @@ class MembersList extends Pagination
     /**
      * Returns the field we want to default set order to
      *
-     * @return string field name
+     * @return int|string
      */
     protected function getDefaultOrder()
     {
@@ -131,7 +132,7 @@ class MembersList extends Pagination
     /**
      * Global getter method
      *
-     * @param string $name name of the property we want to retrive
+     * @param string $name name of the property we want to retrieve
      *
      * @return mixed the called property
      */
@@ -160,9 +161,9 @@ class MembersList extends Pagination
      * Global isset method
      * Required for twig to access properties via __get
      *
-     * @param string $name name of the property we want to retrive
+     * @param string $name name of the property we want to retrieve
      *
-     * @return object the called property
+     * @return bool
      */
     public function __isset($name)
     {
@@ -179,7 +180,7 @@ class MembersList extends Pagination
      * Global setter method
      *
      * @param string $name  name of the property we want to assign a value to
-     * @param object $value a relevant value for the property
+     * @param mixed  $value a relevant value for the property
      *
      * @return void
      */
@@ -269,7 +270,7 @@ class MembersList extends Pagination
                     break;
                 default:
                     Analog::log(
-                        '[MembersList] Unable to set proprety `' . $name . '`',
+                        '[MembersList] Unable to set property `' . $name . '`',
                         Analog::WARNING
                     );
                     break;
@@ -285,7 +286,7 @@ class MembersList extends Pagination
      *
      * @return void
      */
-    public function setViewCommonsFilters($prefs, $view)
+    public function setViewCommonsFilters(Preferences $prefs, $view)
     {
         $filter_options = array(
             Members::FILTER_NAME            => _T("Name"),