diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-12-04 14:08:00 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:22 +0100 |
| commit | c32a31bae596618f4b976e8cb3fdf4a6d269b8bd (patch) | |
| tree | f0ce6c3c061e71b3fe37f98c957f34c5ef887aae | |
| parent | 2e125dd12ee458b7d9e6d8bb9d437edf58bf562e (diff) | |
| download | Ishtar-c32a31bae596618f4b976e8cb3fdf4a6d269b8bd.tar.bz2 Ishtar-c32a31bae596618f4b976e8cb3fdf4a6d269b8bd.zip | |
Improve parcel list render (merge public domain)
| -rw-r--r-- | archaeological_files/models.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 1e8876e66..e251cbebc 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -561,7 +561,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem, return get_values_town_related(self, prefix, values, filtr=filtr) def render_parcels(self): - from archaeological_operations.models import Parcel + Parcel = apps.get_model("archaeological_operations", "Parcel") return Parcel.render_parcels(list(self.parcels.all())) def __str__(self): diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index cc1231f52..5ca822f73 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -2512,14 +2512,15 @@ class Parcel(LightHistorizedItem): for idx, parcels in enumerate(parcels): if c_town != str(parcels.town): c_town = str(parcels.town) - c_section = '' if idx: res += " ; " - res += str(parcels.town) + u' : ' - if c_section: + res += str(parcels.town) + ' : ' + elif c_section: res += " / " + else: # public domain + res += " & " c_section = parcels.section - res += parcels.section + u' ' + res += parcels.section + ' ' res += ", ".join(parcels.parcel_numbers) if parcels.year: res += " (%s)" % str(parcels.year) |