diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-05 19:42:34 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-05 19:42:34 +0200 |
| commit | 8626ef982c690f7f55443e2d8dc8a0348acda9ae (patch) | |
| tree | 796f920c37ba357440f2ed7c48f31a05fc6f51c0 | |
| parent | ab4922e895dda6ce778f2cce785dc69f8d210288 (diff) | |
| download | Ishtar-8626ef982c690f7f55443e2d8dc8a0348acda9ae.tar.bz2 Ishtar-8626ef982c690f7f55443e2d8dc8a0348acda9ae.zip | |
Add town and parcel to find tables (refs #3178)
| -rw-r--r-- | archaeological_finds/models.py | 8 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index e5d63b751..15ed32120 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -280,7 +280,9 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds.context_record.operation.year', 'base_finds.context_record.operation.operation_code', 'container.reference', 'container.location', - 'base_finds.batch'] + 'base_finds.batch', + 'base_finds.context_record.parcel.town', + 'base_finds.context_record.parcel', ] if settings.COUNTRY == 'fr': TABLE_COLS.insert( 6, 'base_finds.context_record.operation.code_patriarche') @@ -289,7 +291,9 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds.cache_complete_id', 'previous_id', 'label', 'material_types', 'datings.period', 'find_number', 'object_types', - 'description'] + 'description', + 'base_finds.context_record.parcel.town', + 'base_finds.context_record.parcel', ] EXTRA_FULL_FIELDS = [ 'base_finds.cache_short_id', 'base_finds.cache_complete_id', diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 85647ac61..3c4b880e8 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -157,8 +157,9 @@ {% field_li "Discovery date" base_find.discovery_date %} {% field_li "Special interest" base_find.special_interest %} {% field_li_detail "Context record" base_find.context_record %} -{% if base_find.context_record %}{% field_li "Parcel" base_find.context_record.parcel %} -{% field_li_detail "Operation" base_find.context_record.operation %}{% endif %} +{% field_li "Town" base_find.context_record.parcel.town %} +{% field_li "Parcel" base_find.context_record.parcel %} +{% field_li_detail "Operation" base_find.context_record.operation %} </ul> {% field "Description" base_find.description "<pre>" "</pre>" %} |