From 47b773c37869b6d81ac92323c5b28a07e3418a93 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Thu, 20 Feb 2025 07:25:28 +0100 Subject: [PATCH] L'affichage des champs se fait dans l'ordre --- src/agenda_culturel/forms.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/agenda_culturel/forms.py b/src/agenda_culturel/forms.py index f73ff7b..ba93ad1 100644 --- a/src/agenda_culturel/forms.py +++ b/src/agenda_culturel/forms.py @@ -654,16 +654,8 @@ class MergeDuplicates(Form): else: checked = self.fields[key].initial - i = 0 - if self.event: - idx = self.events.index(self.event) - result += self.comparison_item(key, i, e["values"][idx], self.fields[e["key"]].choices[idx], self.event, checked) - i += 1 - - for (v, radio, ev) in zip(e["values"], self.fields[e["key"]].choices, self.events): - if self.event is None or ev != self.event: - result += self.comparison_item(key, i, v, radio, ev, checked) - i += 1 + for i, (v, radio, ev) in enumerate(zip(e["values"], self.fields[e["key"]].choices, self.events)): + result += self.comparison_item(key, i, v, radio, ev, checked) result += "" return mark_safe(result)