From ffe83f82da9bfd597e2261cdb07cfdd9f618a070 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 6 Feb 2017 23:42:04 +0100
Subject: Update translations

---
 archaeological_context_records/locale/django.pot | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'archaeological_context_records')

diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot
index e42400f29..11f313b1f 100644
--- a/archaeological_context_records/locale/django.pot
+++ b/archaeological_context_records/locale/django.pot
@@ -92,8 +92,8 @@ msgstr ""
 msgid "Depth (m)"
 msgstr ""
 
-#: forms.py:147 models.py:196 models.py:457
-msgid "Unit"
+#: forms.py:147 forms.py:355 models.py:196 models.py:457
+msgid "Context record type"
 msgstr ""
 
 #: forms.py:148 models.py:198
@@ -216,10 +216,6 @@ msgstr ""
 msgid "Period of the context record"
 msgstr ""
 
-#: forms.py:355
-msgid "Unit type of the context record"
-msgstr ""
-
 #: forms.py:368
 msgid "Documentation search"
 msgstr ""
@@ -273,15 +269,15 @@ msgid "Order"
 msgstr ""
 
 #: models.py:79
-msgid "Parent unit"
+msgid "Parent context record type"
 msgstr ""
 
 #: models.py:83
-msgid "Unit Type"
+msgid "Context record Type"
 msgstr ""
 
 #: models.py:84
-msgid "Unit Types"
+msgid "Context record Types"
 msgstr ""
 
 #: models.py:97
@@ -426,7 +422,7 @@ msgid "ID (left)"
 msgstr ""
 
 #: models.py:413
-msgid "Unit (left)"
+msgid "Context record type (left)"
 msgstr ""
 
 #: models.py:414
@@ -446,7 +442,7 @@ msgid "ID (right)"
 msgstr ""
 
 #: models.py:419
-msgid "Unit (right)"
+msgid "Context record type (right)"
 msgstr ""
 
 #: models.py:420
-- 
cgit v1.2.3


From 7ff5dd8f5d8cab189aa7cc009874ae384ff07240 Mon Sep 17 00:00:00 2001
From: Valérie-Emma Leroux <emma@iggdrasil.net>
Date: Thu, 9 Feb 2017 12:42:53 +0100
Subject: Sheets: remove title from Created_by and add link to creator sheet

---
 .../templates/ishtar/sheet_contextrecord.html                           | 2 +-
 archaeological_files/templates/ishtar/sheet_file.html                   | 2 +-
 archaeological_operations/templates/ishtar/sheet_administrativeact.html | 2 +-
 archaeological_operations/templates/ishtar/sheet_operation.html         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'archaeological_context_records')

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 %}
-- 
cgit v1.2.3


From 61565ed76fa8c0d74bc1dd5c0530b03b131f3f4d Mon Sep 17 00:00:00 2001
From: Valérie-Emma Leroux <emma@iggdrasil.net>
Date: Thu, 9 Feb 2017 17:23:40 +0100
Subject: Admin: debug and add label for context records search

---
 archaeological_context_records/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archaeological_context_records')

diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py
index 353d75925..2f6bb3291 100644
--- a/archaeological_context_records/admin.py
+++ b/archaeological_context_records/admin.py
@@ -37,7 +37,7 @@ class ContextRecordAdmin(HistorizedObjectAdmin):
     list_display = ('label', 'length', 'width',
                     'thickness', 'depth')
     list_filter = ('has_furniture',)
-    search_fields = ('parcel__operation__name', "datings__period__label")
+    search_fields = ('label', 'parcel__operation__common_name', 'datings__period__label')
     model = models.ContextRecord
 
 admin.site.register(models.ContextRecord, ContextRecordAdmin)
-- 
cgit v1.2.3