From 7f97215fe9a0252934001abf48069a6053af8390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 20 Apr 2022 10:03:58 +0200
Subject: [PATCH] activity form: keep the same order for attendee field between
 edit and new form

---
 CHANGELOG.md                                              | 3 ++-
 .../Resources/views/Activity/new.html.twig                | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50b700983..3c85e41af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-* invert 'incoming' and 'receiving' in Activity form
+* [Activity form] invert 'incoming' and 'receiving' in Activity form
+* [Activity form] keep the same order for 'attendee' field in new and edit form
 
 
 ## Test releases
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index a7751cd5a..8e078702c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -85,15 +85,15 @@
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.attendee is defined -%}
+    {{ form_row(form.attendee) }}
+{% endif %}
+
 {%- if form.documents is defined -%}
     {{ form_row(form.documents) }}
     <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
 {% endif %}
 
-{%- if form.attendee is defined -%}
-    {{ form_row(form.attendee) }}
-{% endif %}
-
 {# TODO .. status #}
 
 <ul class="record_actions sticky-form-buttons">