summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archaeological_context_records/templates/ishtar/sheet_contextrecord.html4
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html4
2 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 7fd004362..ed4dc3c2f 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -118,11 +118,11 @@
<td class="ref">{{ find.material_type_label }}</td>
{# Displayed as (Patriarche operation code)-(Record unit label)-(material code)-(Finds label indexed by material type). #}
{# or displayed as (Year)-(index)-(Record unit label)-(material code)-(Finds label indexed by material type) #}
- <td class="string">{{ find.material|default:"" }}</td>
+ <td class="string">{{ find.get_last_find.material_type|default:"" }}</td>
<td>{{find.context_record.label}}</td>
<td>{{ find.get_last_find.dating}}</td>{# TODO .all|join:", " ? #}
<td>{{ find.get_last_find.description }}</td>
- <td>{{ find.get_last_find.weight }}</td>
+ <td>{{ find.get_last_find.weight|default:"" }}</td>
<td>{{ find.get_last_find.item_number }}</td>
<td>{{ item.context_record.parcel.short_label }}</td>
<td class='link'><a href="#">{% trans "Details" %}</a></td>
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 1e43c7112..8b8207263 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -162,11 +162,11 @@
{# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #}
{# or displayed as (Year)-(index)-(Record unit label)-(Finds label). #}
<td class="ref">{{ find.material_type_label }}</td>
- <td class="string">{{ find.material|default:"" }}</td>
+ <td class="string">{{ find.get_last_find.material_type|default:"" }}</td>
<td>{{find.context_record.label}}</td>
<td class='string'>{{ find.get_last_find.dating}}</td>{# TODO .all|join:", " ? #}
<td class='string'>{{ find.get_last_find.description }}</td>
- <td>{{ find.get_last_find.weight }}</td>
+ <td>{{ find.get_last_find.weight|default:"" }}</td>
<td>{{ find.get_last_find.item_number }}</td>
<td class="ref">{{ context_record.parcel.short_label }}</td>
<td class='link'><a href="#">{% trans "Details" %}</a></td>