From 222506fddb21d3c4e87fc6faf9b905dd988062c6 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 14 Nov 2025 15:18:00 +0100 Subject: ✨ datings refactoring: modify view/form MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/models_common.py | 10 +++++++--- ishtar_common/templates/ishtar/blocks/sheet_dating_list.html | 6 ++++-- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 821a89ac4..00ff8babd 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -3306,7 +3306,7 @@ class SerializeItem: SERIALIZATION_FILES = [] SERIALIZE_STRING = [] - def full_serialize(self, search_model=None, recursion=False, request=None) -> dict: + def full_serialize(self, search_model=None, recursion=False, request=None, keep_id=False) -> dict: """ API serialization :return: data dict @@ -3418,8 +3418,12 @@ class SerializeItem: continue full_result[k] = getattr(self, self.SERIALIZE_CALL[k])() full_result["SLUG"] = self.SLUG - full_result["pk"] = f"external_{self.pk}" - full_result["id"] = f"external_{self.id}" + if not keep_id: + full_result["pk"] = f"external_{self.pk}" + full_result["id"] = f"external_{self.id}" + else: + full_result["pk"] = self.pk + full_result["id"] = self.id return full_result def get_associated_main_item_list(self, attr, model) -> list: diff --git a/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html b/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html index f4ec6c33a..cc1add777 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html @@ -33,9 +33,11 @@ {{dating.precise_dating|default_if_none:"-"}} - {% if can_change %} + {% if can_change and dating.pk %} - + + -- cgit v1.2.3