From 3bb6627b4b30edc4c06a544cf4fe7bfdebff6f35 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 4 Nov 2016 11:26:34 +0100
Subject: Files: add project name field for research archaeology (refs #3345)

---
 archaeological_files/templates/ishtar/sheet_file.html | 4 ++--
 archaeological_files_pdl/forms.py                     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 211d2b181..f228531e1 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -41,7 +41,7 @@
 
 {% field_li "Type" item.file_type %}
 
-{% if item.related_file %}<li><label>{%trans "Related file:"%}</label> <span class='value'><a href='#' onclick='load_window("{% url show-file item.related_file.pk ''%}")'>{{ item.related_file }}</a></span></li>{% endif %}
+{% if item.related_file %}<li><label>{%trans "Related file:"%}</label> <span class='value'><a href='#' onclick='load_window("{% url show-file item.related_file.pk "" %}")'>{{ item.related_file }}</a></span></li>{% endif %}
 
 </ul>
 {% field "Comment" item.comment "<pre>" "</pre>" %}
@@ -129,7 +129,7 @@
     <td class='string'>{{operation.in_charge|default:""}}</td>
     <td>{{operation.start_date|default:""}}</td>
     <td>{{operation.excavation_end_date|default:""}}</td>
-    <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-operation operation.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td>
+    <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-operation operation.pk "" %}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td>
   </tr>
   {% empty %}
   <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaelogical file" %}</td></tr>
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index cf241aa18..3b800dc8a 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -116,6 +116,8 @@ class FileFormResearchAddress(forms.Form):
     form_label = _(u"Address")
     base_models = ['town', 'department']
     associated_models = {'town': Town, 'department': Department}
+    name = forms.CharField(label=_(u"Project name"), required=False,
+                           max_length=100)
     town = widgets.MultipleAutocompleteField(
         model=Town, label=_("Towns"), required=False)
     department = widgets.MultipleAutocompleteField(
-- 
cgit v1.2.3