From 1bbce2bb81732af8f0934fb86162e1f47bc7fc81 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 7 Jul 2021 19:38:29 +0200
Subject: [PATCH] person details page: one edit button at bottom of page, fix
 regression

---
 .../Resources/views/Person/view.html.twig     | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index 1cdae73b0..88e69a389 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -77,9 +77,7 @@ This view should receive those arguments:
                         </dl>
 
 
-                        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                            {{ include(edit_tmp_name, edit_tmp_args) }}
-                        {% endif %}
+                        
                     </figure>
                 </div>
 
@@ -117,9 +115,7 @@ This view should receive those arguments:
                             {%- endif -%}
                         </dl>
 
-                        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                            {{ include(edit_tmp_name, edit_tmp_args) }}
-                        {% endif %}
+                        
                     </figure>
                 </div>
             </div>
@@ -171,9 +167,7 @@ This view should receive those arguments:
                         </dl>
                         {%- endif -%}
 
-                        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                            {{ include(edit_tmp_name, edit_tmp_args) }}
-                        {% endif %}
+                        
                     </figure>
                 </div>
                 {%- endif -%}
@@ -240,16 +234,14 @@ This view should receive those arguments:
                         </dl>
                         {%- endif -%}
 
-                        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                            {{ include(edit_tmp_name, edit_tmp_args) }}
-                        {% endif %}
+                        
                     </figure>
                 </div>
                 {%- endif -%}
             </div>
         </div>
 
-    {% if cFGroup and (cFGroup.getActiveCustomFields|length > 0) %}
+        {% if cFGroup and (cFGroup.getActiveCustomFields|length > 0) %}
         <div class="col-10">
             <div class="row">
                 <div class="col-12 custom-fields">
@@ -261,13 +253,20 @@ This view should receive those arguments:
         </div>
 
         <div class="col-10">
-            <figure class="person-details">
-            {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                {{ include(edit_tmp_name, edit_tmp_args) }}
-            {% endif %}
-            </figure>
+            <figure class="person-details"></figure>
         </div>
-    {% endif %}
+        {% endif %}
+    
+        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+        <ul class="sticky-form-buttons record_actions ">
+            <li>
+                <a class="btn btn-update" href="{{ path('chill_person_general_edit', { 'person_id': person.id }) }}">
+                   {{ 'Edit'|trans }}
+                </a>
+            </li>
+
+        </ul>
+        {% endif %}
 
     </div>
 </div> <!-- end of div.person-view -->