diff options
author | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-02-09 12:42:53 +0100 |
---|---|---|
committer | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-02-09 12:42:53 +0100 |
commit | 7ff5dd8f5d8cab189aa7cc009874ae384ff07240 (patch) | |
tree | 9e02015745e10616b9eea3b659b3fc8af0da7df0 | |
parent | b42ddd9cc95173cca6d2b4d6433db5b2d8506804 (diff) | |
download | Ishtar-7ff5dd8f5d8cab189aa7cc009874ae384ff07240.tar.bz2 Ishtar-7ff5dd8f5d8cab189aa7cc009874ae384ff07240.zip |
Sheets: remove title from Created_by and add link to creator sheet
4 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 e5304f9cb..e44597961 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -16,7 +16,7 @@ <ul class='form-flex'> <li><label>{% if item.operation.code_patriarche %}{%trans "Complete ID:"%}{% else %}{%trans "Temporary ID:"%}{% endif %}</label><span class='value'>{{item.full_label}}</span></li> {% field_li "Creation date" item.creation_date %} -{% field_li "Created by" item.history_creator.ishtaruser.full_label %} +{% field_li_detail "Created by" item.history_creator.ishtaruser.person %} {% field_li "Type" item.unit %} {% field_li_multiple "Chronology" item.datings %} {% field_li "Town" item.parcel.town %} diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 249a9846c..071db20ee 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -23,7 +23,7 @@ {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %} {% field_li "Creation date" item.creation_date|date:"DATE_FORMAT" %} -{% field_li "Created by" item.history_creator.ishtaruser.full_label %} +{% field_li_detail "Created by" item.history_creator.ishtaruser.person %} {% comment %} {% if item.deadline_date and not item.acts %} 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 %} |