From 4dd47534de59d7c6162a92a308dfa765ede9e6ea Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 3 May 2024 12:28:46 +0200 Subject: ✨ item deletion: better display of associated deleted items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/wizards.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ishtar_common/wizards.py') diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index 9801e596f..c4691c4f2 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -1867,6 +1867,7 @@ class MultipleDeletionWizard(MultipleItemWizard): res[field.name] = (label, value, "") full_res.append(res) datas = [] + deleted_data = {} for idx, res in enumerate(full_res): data = [] for field in self.fields: @@ -1874,6 +1875,13 @@ class MultipleDeletionWizard(MultipleItemWizard): data.append(res[field]) obj = self.current_objs[idx] datas.append((f"{obj.class_verbose_name() if hasattr(obj, 'class_verbose_name') else ''} - {obj}", data)) + if hasattr(obj, "get_deleted_data"): + for key, value in obj.get_deleted_data().items(): + if key not in deleted_data: + deleted_data[key] = [] + deleted_data[key] += [(v, "", "") for v in value] + for key, value in deleted_data.items(): + datas.append((key, value)) return datas def get_context_data(self, form, **kwargs): -- cgit v1.2.3