Update source search fields

5 files changed, 23 insertions, 0 deletions

diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py
index 13375f866..dc26fc507 100644
--- a/archaeological_context_records/views.py
+++ b/archaeological_context_records/views.py
@@ -60,6 +60,10 @@ get_contextrecordsource = get_item(
     'get_contextrecordsource', 'contextrecordsource',
     bool_fields=['duplicate'],
     extra_request_keys={
+        'title': 'title__icontains',
+        'description': 'description__icontains',
+        'comment': 'comment__icontains',
+        'additional_information': 'additional_information__icontains',
         'context_record__parcel__town': 'context_record__parcel__town__pk',
         'context_record__operation__year': 'context_record__operation__year',
         'context_record__operation': 'context_record__operation__pk',
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 36388d85b..134a17943 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -70,6 +70,10 @@ get_findsource = get_item(
     models.FindSource, 'get_findsource', 'findsource',
     bool_fields=['duplicate'],
     extra_request_keys={
+        'title': 'title__icontains',
+        'description': 'description__icontains',
+        'comment': 'comment__icontains',
+        'additional_information': 'additional_information__icontains',
         'find__context_record__operation__year':
             'find__context_record__operation__year',
         'find__datings__period': 'find__datings__period__pk',
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index a10f63e88..8b8d820a3 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -157,6 +157,10 @@ get_operationsource = get_item(
     'get_operationsource', 'operationsource',
     bool_fields=['duplicate'],
     extra_request_keys={
+        'title': 'title__icontains',
+        'description': 'description__icontains',
+        'comment': 'comment__icontains',
+        'additional_information': 'additional_information__icontains',
         'operation__towns': 'operation__towns__pk',
         'operation__operation_type': 'operation__operation_type__pk',
         'operation__year': 'operation__year'})
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 29997a741..5863baab2 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -593,6 +593,9 @@ class SourceForm(forms.Form):
                               required=False)
     description = forms.CharField(label=_(u"Description"),
                                   widget=forms.Textarea, required=False)
+    additional_information = forms.CharField(
+        label=_(u"Additional information"), widget=forms.Textarea,
+        required=False)
     duplicate = forms.BooleanField(label=_(u"Has a duplicate"),
                                    required=False)
 
@@ -609,9 +612,14 @@ class SourceSelect(TableSelect):
         validators=[models.valid_id(models.Author)], label=_(u"Author"),
         required=False)
 
+    title = forms.CharField(label=_(u"Title"))
     source_type = forms.ChoiceField(label=_("Source type"), choices=[])
     reference = forms.CharField(label=_(u"Reference"))
     internal_reference = forms.CharField(label=_(u"Internal reference"))
+    description = forms.CharField(label=_(u"Description"))
+    comment = forms.CharField(label=_(u"Comment"))
+    additional_information = forms.CharField(
+        label=_(u"Additional informations"))
     duplicate = forms.NullBooleanField(label=_(u"Has a duplicate"))
 
     def __init__(self, *args, **kwargs):
diff --git a/ishtar_common/templates/ishtar/sheet_source.html b/ishtar_common/templates/ishtar/sheet_source.html
index 47e285017..06001f783 100644
--- a/ishtar_common/templates/ishtar/sheet_source.html
+++ b/ishtar_common/templates/ishtar/sheet_source.html
@@ -12,6 +12,9 @@
 {% field "Item number" item.item_number %}
 {% field "Ref." item.reference %}
 {% field "Internal ref." item.internal_reference %}
+{% field "Creation date" item.creation_date %}
+{% field "Receipt date" item.receipt_date %}
+{% field "Receipt date in documentation" item.receipt_date_in_documentation %}
 {% field "Has a duplicate" item.duplicate %}
 {% field "Description" item.description %}
 {% field "Comment" item.comment %}