diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-10 00:47:53 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-10 00:47:53 +0100 |
| commit | 6aec8a5e2693a0ea2a46a8edc3ea1f4406ab8e51 (patch) | |
| tree | 200b15910df3d8d718d657ae8501d12ec57faabb /archaeological_operations | |
| parent | ed2d630c8eea29fd68383105a4aa793a55b455ea (diff) | |
| parent | 7f394d6dd2631f7d5f985b5ec976c79a30434ee8 (diff) | |
| download | Ishtar-6aec8a5e2693a0ea2a46a8edc3ea1f4406ab8e51.tar.bz2 Ishtar-6aec8a5e2693a0ea2a46a8edc3ea1f4406ab8e51.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_administrativeact.html | 2 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html index b12c1f8c0..080275aa9 100644 --- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html +++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html @@ -35,7 +35,7 @@ {% if item.operation and item.operation.surface %} <li><label>{% trans "Surface:"%}</label> <span class='value'>{{ item.operation.surface }} m<sup>2</sup> ({{ item.operation.surface_ha }} ha)</span></li> {% endif %} - {% field_li "Created by" item.history_creator.ishtaruser %} + {% field_li_detail "Created by" item.history_creator.ishtaruser.person %} {% comment %}{% if item.general_contractor.attached_to %}<p> <label>{% trans "General contractor organisation:"%}</label> <span class='value'>{{ item.general_contractor.attached_to }}</span></p>{% endif %} <!-- Contractor's organisation displayed as concat of Name/Adress/postal_code/city --> diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 43446c516..28e4ae6b5 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -25,7 +25,7 @@ <ul class='form-flex'> {% field_li "Old code" item.old_code %} <li><label>{%trans "Last modification date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></li> <!-- date = now --> -{% field_li "Created by" item.history_creator.ishtaruser.full_label %} +{% field_li_detail "Created by" item.history_creator.ishtaruser.person %} {% field_li "Begining date" item.start_date %} {% field_li "Excavation end date" item.excavation_end_date|default:"-" %} {% field_li_detail "Head scientist" item.scientist %} |