Do not attach dynamic fields to contact infos

diff --git a/galette/templates/default/components/form.html.twig b/galette/templates/default/components/form.html.twig
index 8cc6883578906b7fe3c9d4902f0bad0a0397e62b..bc89a59ac6246e4a7aae1569618ae7e747c016b2 100644 (file)
--- a/galette/templates/default/components/form.html.twig
+++ b/galette/templates/default/components/form.html.twig
@@ -131,9 +131,8 @@
                 </div>
             </div>
 
-                {# Dynamic entries #}
+                {# Social networks attached to the contact information fieldset #}
                 {% if fieldset.id == 3 %}
                     {% include "elements/edit_socials.html.twig" with {socials: member.socials} %}
-                    {% include "components/dynamic_fields.html.twig" with {object: member} %}
                 {% endif %}
             {% endfor %}

diff --git a/galette/templates/default/pages/member_form.html.twig b/galette/templates/default/pages/member_form.html.twig
index 1f51a54b40886f57c59f596fce46d337ffe4fcc0..6d8830cee951cb3638de73768cea934487cd0d99 100644 (file)
--- a/galette/templates/default/pages/member_form.html.twig
+++ b/galette/templates/default/pages/member_form.html.twig
@@ -101,6 +101,9 @@
             {# Main form entries #}
             {% include "components/form.html.twig" %}
 
+            {# Dynamic entries #}
+            {% include "components/dynamic_fields.html.twig" with {object: member} %}
+
     {% if not member.id and not self_adh %}
         {% if login.isAdmin() or login.isStaff() %}
             <div class="ui center aligned yellow segment">

diff --git a/galette/templates/default/pages/member_show.html.twig b/galette/templates/default/pages/member_show.html.twig
index 05c2c25b2846e1fb11ae963f76af36d84f30aac0..2a3d92c32111970737758a452215f77e5faa9215 100644 (file)
--- a/galette/templates/default/pages/member_show.html.twig
+++ b/galette/templates/default/pages/member_show.html.twig
@@ -231,11 +231,14 @@
                     </div>
                 </div>
             </div>
+    {# Social networks attached to the contact information fieldset #}
     {% if display_element.id == '3'  %}
             {% include "elements/display_socials.html.twig" with {socials: member.socials} %}
-            {% include "elements/display_dynamic_fields.html.twig" with {object: member} %}
     {% endif %}
 {% endfor %}
+
+            {# Dynamic entries #}
+            {% include "elements/display_dynamic_fields.html.twig" with {object: member} %}
         </div>
     </div>
 </div>