Do not display separator or files in dynamic contributions fields; refs #1693

diff --git a/galette/lib/Galette/Controllers/Crud/MembersController.php b/galette/lib/Galette/Controllers/Crud/MembersController.php
index f98093c42c03461b1e018f96d7cf148f310f0eed..e9f91ba5cbb8a892bf041a5b77abc54228e4e803 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/MembersController.php
+++ b/galette/lib/Galette/Controllers/Crud/MembersController.php
@@ -723,8 +723,8 @@ class MembersController extends CrudController
                 'page_title'            => _T("Advanced search"),
                 'filter_groups_options' => $groups_list,
                 'search_fields'         => $fields,
-                'adh_dynamics'          => $adh_dynamics->getFields(),
-                'contrib_dynamics'      => $contrib_dynamics->getFields(),
+                'adh_dynamics'          => $adh_dynamics->getSearchFields(),
+                'contrib_dynamics'      => $contrib_dynamics->getSearchFields(),
                 'adh_socials'           => $social_types,
                 'statuts'               => $statuts->getList(),
                 'contributions_types'   => $ct->getList(),

diff --git a/galette/lib/Galette/Entity/DynamicFieldsHandle.php b/galette/lib/Galette/Entity/DynamicFieldsHandle.php
index dd6d51bba27349700b1c209b9e29971ac75744ce..9e973eba5d4b08ef7bc1a64980d63dba58c0b99a 100644 (file)
--- a/galette/lib/Galette/Entity/DynamicFieldsHandle.php
+++ b/galette/lib/Galette/Entity/DynamicFieldsHandle.php
@@ -37,6 +37,8 @@
 namespace Galette\Entity;
 
 use ArrayObject;
+use Galette\DynamicFields\File;
+use Galette\DynamicFields\Separator;
 use Throwable;
 use Analog\Analog;
 use Laminas\Db\Adapter\Driver\StatementInterface;
@@ -184,6 +186,24 @@ class DynamicFieldsHandle
         return $this->dynamic_fields;
     }
 
+    /**
+     * Get fields for search pages
+     *
+     * @return array
+     */
+    public function getSearchFields(): array
+    {
+        $dynamics = $this->dynamic_fields;
+
+        foreach ($dynamics as $key => $field) {
+            if ($field instanceof Separator || $field instanceof File) {
+                unset($dynamics[$key]);
+            }
+        }
+
+        return $dynamics;
+    }
+
     /**
      * Get values
      *