diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-07-17 17:09:35 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:17 +0100 |
| commit | 88126820a6ea96d5ad1ad3eb09a1edff2b26b701 (patch) | |
| tree | 731f6c3d84790a91c6acb4fe9920ee94767e7c90 | |
| parent | c73c38ab243b3a54a36b284376d9fb986bce02d7 (diff) | |
| download | Ishtar-88126820a6ea96d5ad1ad3eb09a1edff2b26b701.tar.bz2 Ishtar-88126820a6ea96d5ad1ad3eb09a1edff2b26b701.zip | |
Site creation: fix post message
| -rw-r--r-- | CHANGES.md | 7 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/forms/modify_parcels.html | 2 | ||||
| -rw-r--r-- | ishtar_common/version.py | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index 3d7f1103a..75abf36df 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,13 @@ date: 2022-11-04 Ishtar changelog ================ +v4.0.6 - 2022-07-17 +-------------------- + +### Bug fix ### + +- Site creation: fix post message + v4.0.5 - 2022-07-17 -------------------- diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 205cac550..3ee2cf20e 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -540,7 +540,7 @@ class ArchaeologicalSite( ] def __str__(self): - return self.cached_label or "" + return self.cached_label or self._generate_cached_label() or "" @property def short_class_name(self): diff --git a/ishtar_common/templates/ishtar/forms/modify_parcels.html b/ishtar_common/templates/ishtar/forms/modify_parcels.html index c8e54e917..067655889 100644 --- a/ishtar_common/templates/ishtar/forms/modify_parcels.html +++ b/ishtar_common/templates/ishtar/forms/modify_parcels.html @@ -42,7 +42,7 @@ </button> <button type="button" data-dismiss="modal" aria-label="Close" class="btn btn-secondary"> - {% trans "Cancel" %} + {% trans "Close" %} </button> {% endblock %} </div> diff --git a/ishtar_common/version.py b/ishtar_common/version.py index 7b6d2660d..f831bfb47 100644 --- a/ishtar_common/version.py +++ b/ishtar_common/version.py @@ -1,5 +1,5 @@ -# 4.0.5 -VERSION = (4, 0, 5) +# 4.0.6 +VERSION = (4, 0, 6) def get_version(): |