diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-11-14 15:18:00 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-11-14 17:58:03 +0100 |
| commit | 222506fddb21d3c4e87fc6faf9b905dd988062c6 (patch) | |
| tree | b940e28f9eadf2f3a81c859f5c576e42febdb00f /ishtar_common | |
| parent | 872bc0f6b00c44a5978a826c063a3f1e50dd4b15 (diff) | |
| download | Ishtar-222506fddb21d3c4e87fc6faf9b905dd988062c6.tar.bz2 Ishtar-222506fddb21d3c4e87fc6faf9b905dd988062c6.zip | |
✨ datings refactoring: modify view/form
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/models_common.py | 10 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/sheet_dating_list.html | 6 |
2 files changed, 11 insertions, 5 deletions
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 @@ <td> {{dating.precise_dating|default_if_none:"-"}} </td> - {% if can_change %} + {% if can_change and dating.pk %} <td> - <a class="btn btn-success btn-sm" title="Modifier" href="/geo/edit/37130/?find_id=94034&back_url=/find_search/%3Fopen_item=46434"><i class="fa fa-pencil"></i></a> + <a class="btn btn-qa btn-success btn-sm" title="{% trans 'Modify' %}" + href="#" data-target="{% url url_dating|add:'-modify' item.pk dating.pk %}"> + <i class="fa fa-pencil"></i></a> </td> <td> <a class="btn btn-danger btn-sm" title="Supprimer" href="/geo/delete/37130/?find_id=94034&back_url=/find_search/%3Fopen_item=46434"> |