summaryrefslogtreecommitdiff
path: root/archaeological_context_records/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-21 19:11:33 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-21 19:12:19 +0200
commit2424d558f6de4b422f0cfd2357014fe7f7c767ff (patch)
tree35dbc10d9b211efdae80d13e820cb52dd72d04f8 /archaeological_context_records/templates
parenta16d70575ce1cfef22a8c59093de49853460affc (diff)
downloadIshtar-2424d558f6de4b422f0cfd2357014fe7f7c767ff.tar.bz2
Ishtar-2424d558f6de4b422f0cfd2357014fe7f7c767ff.zip
Context record sheet: fix head scientist of the associated operation (refs #2817)
Diffstat (limited to 'archaeological_context_records/templates')
-rw-r--r--archaeological_context_records/templates/ishtar/sheet_contextrecord.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index df91f678f..2d2f6cbd1 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -103,8 +103,7 @@
{% else %}<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{%trans "Patriarche OA code not yet recorded!"%}</label></p>
{%endif%}
{#<p><label>{%trans "Operation's name:"%}</label><span class='value'>{{ item.operation.internal_reference }}</span></p>#}
-<p><label>{%trans "Head scientist:"%}</label>
-<span class='value'>{{ item.operation.in_charge.full_label }}</span></p>
+{% if item.operation.scientist %}<p><label>{%trans "Head scientist:"%}</label> <span class='value'>{{ item.operation.scientist.full_label }} <a href='#' onclick='load_window("{% url show-person item.operation.scientist.pk ''%}");'><i class="fa fa-info-circle" aria-hidden="true"></i></a></span></p>{%endif%}
<p><label>{%trans "State:"%}</label>
{% if item.operation.is_active %}
<span class='value'>{%trans "Active file"%}</span></p>
@@ -116,7 +115,8 @@
<p><label>{%trans "Type:"%}</label> <span class='value'>{{ item.operation.operation_type }}</span></p>
<p><label>{%trans "Remains:"%}</label> <span class='value'>{{ item.operation.remains.all|join:", " }}</span></p>
<p><label>{%trans "Periods:"%}</label> <span class='value'>{{ item.operation.periods.all|join:", " }}</span></p>
-{% if item.operation.comment %}<p><label>{%trans "Comment:"%}</label> <span class='value'>{{ item.operation.comment }}</span></p>{%endif%}
+{% field "Comment" item.operation.comment "<pre>" "</pre>" %}
+
<h3>{% trans "Localisation"%}</h3>
<p><label>{%trans "Towns:"%}</label> <span class='value'>{{ item.operation.towns.all|join:", " }}</span></p>
<p><label>{%trans "Related operation:"%}</label>