List only "form" fields for import model

diff --git a/galette/includes/dependencies.php b/galette/includes/dependencies.php
index fc08e009ed93a76aa1dc26ead9f428c98efa99e9..696c794eccd981a94c9203e3962cb946f639eefa 100644 (file)
--- a/galette/includes/dependencies.php
+++ b/galette/includes/dependencies.php
@@ -244,6 +244,17 @@ $container['members_fields'] = function ($c) {
     return $members_fields;
 };
 
+$container['members_form_fields'] = function ($c) {
+    $fields = $c->get('members_fields');
+    foreach ($fields as $k => $field) {
+        if ($field['position'] == -1) {
+            unset($fields[$k]);
+        }
+    }
+    return $fields;
+};
+
+
 $container['members_fields_cats'] = function ($c) {
     include_once GALETTE_ROOT . 'includes/fields_defs/members_fields_cats.php';
     return $members_fields_cats;

diff --git a/galette/lib/Galette/Controllers/AbstractController.php b/galette/lib/Galette/Controllers/AbstractController.php
index 8228033342839eedfcaf1e6573e46e20f9de05f2..ed007e81fa598ade959c9c14defaa289db11df2c 100644 (file)
--- a/galette/lib/Galette/Controllers/AbstractController.php
+++ b/galette/lib/Galette/Controllers/AbstractController.php
@@ -126,6 +126,11 @@ abstract class AbstractController
      * @var array
      */
     protected $members_fields;
+    /**
+     * @Inject
+     * @var array
+     */
+    protected $members_form_fields;
     /**
      * @Inject
      * @var array
@@ -163,6 +168,7 @@ abstract class AbstractController
         $this->lists_config = $container->get('lists_config');
         $this->notFoundHandler = $container->get('notFoundHandler');
         $this->members_fields = $container->get('members_fields');
+        $this->members_form_fields = $container->get('members_form_fields');
         $this->members_fields_cats = $container->get('members_fields_cats');
     }
 

diff --git a/galette/lib/Galette/Controllers/CsvController.php b/galette/lib/Galette/Controllers/CsvController.php
index 217e5408b18acf6ddcd055f2aa8936f55e4a2f4a..16e5c196bf953c21d3f8fe3df16fe5a029b5e0bd 100644 (file)
--- a/galette/lib/Galette/Controllers/CsvController.php
+++ b/galette/lib/Galette/Controllers/CsvController.php
@@ -565,7 +565,7 @@ class CsvController extends AbstractController
             $defaults_loaded = true;
         }
 
-        $import_fields = $this->members_fields;
+        $import_fields = $this->members_form_fields;
         //get dynamic fields
         $dynamic_import_fields = [];
         $fieldset = new DynamicFieldsSet($this->zdb, $this->login);