Add "non member" filter; fixes #677

diff --git a/galette/lib/Galette/Filters/MembersList.php b/galette/lib/Galette/Filters/MembersList.php
index d1ca117562caf38d35c8483fde088f3d619d56cb..8eedb82267b6fee5189f826fb718afd78db2279c 100644 (file)
--- a/galette/lib/Galette/Filters/MembersList.php
+++ b/galette/lib/Galette/Filters/MembersList.php
@@ -309,7 +309,8 @@ class MembersList extends Pagination
                 Members::MEMBERSHIP_LATE    => _T("Latecomers"),
                 Members::MEMBERSHIP_NEVER   => _T("Never contributed"),
                 Members::MEMBERSHIP_STAFF   => _T("Staff members"),
-                Members::MEMBERSHIP_ADMIN   => _T("Administrators")
+                Members::MEMBERSHIP_ADMIN   => _T("Administrators"),
+                Members::MEMBERSHIP_NONE    => _T("Non members")
             )
         );
 

diff --git a/galette/lib/Galette/Repository/Members.php b/galette/lib/Galette/Repository/Members.php
index c6439f1033fc250c506a869d1e3d32f60f96b482..068e852b35fbe643d91a4c9aa864848232f9bca3 100644 (file)
--- a/galette/lib/Galette/Repository/Members.php
+++ b/galette/lib/Galette/Repository/Members.php
@@ -99,6 +99,7 @@ class Members
     const MEMBERSHIP_NEVER = 4;
     const MEMBERSHIP_STAFF = 5;
     const MEMBERSHIP_ADMIN = 6;
+    const MEMBERSHIP_NONE = 7;
 
     const ORDERBY_NAME = 0;
     const ORDERBY_NICKNAME = 1;
@@ -1019,6 +1020,9 @@ class Members
                 case self::MEMBERSHIP_ADMIN:
                     $select->where('bool_admin_adh = ?', true);
                     break;
+                case self::MEMBERSHIP_NONE:
+                    $select->where('a.id_statut = ?', Status::DEFAULT_STATUS);
+                    break;
                 }
             }