summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2025-12-01 15:38:11 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2025-12-01 18:12:52 +0100
commit45421bf385ba8219a470e84abbf64151010a2044 (patch)
tree4215891dc34e63273f85799e74376bc855068528
parent303ce6d4d2f816f3f9e4eeb426c1ee3b2db2895c (diff)
downloadIshtar-45421bf385ba8219a470e84abbf64151010a2044.tar.bz2
Ishtar-45421bf385ba8219a470e84abbf64151010a2044.zip
🐛 use > instead of / for some hierarchical items (refs #6513)
- container localisations - geographic area - documents types - inline help for hierarchical types
-rw-r--r--archaeological_warehouse/models.py2
-rw-r--r--ishtar_common/models.py4
-rw-r--r--ishtar_common/models_common.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 61ba4845e..43ff718a8 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -1342,7 +1342,7 @@ class Container(
def generate_full_location(self):
full_location = [location.short_label for location in self.get_localisations()]
full_location.append(self.short_label)
- return " / ".join(full_location)
+ return " > ".join(full_location)
def _generate_cached_weight(self):
return self.weight if self.weight else self.calculated_weight
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 00c17db14..2be69ff69 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2634,7 +2634,7 @@ class Area(HierarchicalType, DocumentItem, MainItem):
label = [str(self)]
if self.parent and self.parent.pk != self.pk:
label.append(self.parent.full_label)
- return " / ".join(label)
+ return " > ".join(label)
def _get_base_image_path(self):
return self.SLUG
@@ -5484,7 +5484,7 @@ class Document(
while source_type:
source_types.append(str(source_type))
source_type = source_type.parent
- return " / ".join(reversed(source_types))
+ return " > ".join(reversed(source_types))
def public_representation(self):
site = Site.objects.get_current()
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 75aa6c986..c80e2f34c 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -346,7 +346,7 @@ class GeneralType(Cached, models.Model):
c_item = c_item.parent
parents.reverse()
parents.append(item.label)
- item.label = " / ".join(parents)
+ item.label = " > ".join(parents)
if not item.comment:
continue
if c_rank > item.rank: