6 files changed, 84 insertions, 2 deletions
diff --git a/archaeological_files/admin.py b/archaeological_files/admin.py
index 525f7e840..4dca1afa9 100644
--- a/archaeological_files/admin.py
+++ b/archaeological_files/admin.py
@@ -48,13 +48,15 @@ class FileAdmin(HistorizedObjectAdmin):
                       'related_file': 'file'
                       })
     readonly_fields = HistorizedObjectAdmin.readonly_fields + [
-        'raw_general_contractor', 'raw_town_planning_service', 'imports',
+        'raw_general_contractor', 'raw_town_planning_service',
         'cached_label', 'imported_line'
     ]
     model = models.File
 
+
 admin_site.register(models.File, FileAdmin)
 
+
 general_models = [models.FileType, models.PermitType]
 if settings.COUNTRY == 'fr':
     general_models.append(models.SaisineType)
diff --git a/archaeological_files/migrations/0008_auto_20171011_1644.py b/archaeological_files/migrations/0008_auto_20171011_1644.py
new file mode 100644
index 000000000..33dfbf59e
--- /dev/null
+++ b/archaeological_files/migrations/0008_auto_20171011_1644.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-11 16:44
+from __future__ import unicode_literals
+
+import django.contrib.postgres.search
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_files', '0007_auto_20170826_1152'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='file',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
+        ),
+        migrations.AddField(
+            model_name='historicalfile',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
+        ),
+    ]
diff --git a/archaeological_files/migrations/0009_auto_20171012_1316.py b/archaeological_files/migrations/0009_auto_20171012_1316.py
new file mode 100644
index 000000000..cd33d8243
--- /dev/null
+++ b/archaeological_files/migrations/0009_auto_20171012_1316.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-12 13:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_files', '0008_auto_20171011_1644'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='file',
+            name='cached_label',
+            field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Cached name'),
+        ),
+        migrations.AlterField(
+            model_name='historicalfile',
+            name='cached_label',
+            field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Cached name'),
+        ),
+    ]
diff --git a/archaeological_files/migrations/0010_auto_20171017_1840.py b/archaeological_files/migrations/0010_auto_20171017_1840.py
new file mode 100644
index 000000000..04eb5b1cc
--- /dev/null
+++ b/archaeological_files/migrations/0010_auto_20171017_1840.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-17 18:40
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_files', '0009_auto_20171012_1316'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='file',
+            name='data',
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
+        ),
+        migrations.AddField(
+            model_name='historicalfile',
+            name='data',
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
+        ),
+    ]
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 0d5b4b3e8..b0f53f11c 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -204,7 +204,8 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         mh_listing = models.NullBooleanField(
             u"Sur Monument Historique inscrit", blank=True, null=True)
     # <-- research archaeology
-    cached_label = models.TextField(_(u"Cached name"), null=True, blank=True)
+    cached_label = models.TextField(_(u"Cached name"), null=True, blank=True,
+                                    db_index=True)
     imported_line = models.TextField(_(u"Imported line"), null=True,
                                      blank=True)
     history = HistoricalRecords()
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 6d64a975f..6eda1124a 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -44,6 +44,8 @@
 </ul>
 {% field "Comment" item.comment "<pre>" "</pre>" %}
 
+{% include "ishtar/blocks/sheet_json.html" %}
+
 <h3>{% trans "Localisation"%}</h3>
 {% if item.towns.count %}<p><label>{%trans "Towns"%}</label> <span class='value'>{{ item.towns.all|join:", " }}</span></p>{% endif %}
 {% if item.departments.count %}<p><label>{%trans "Departments"%}</label> <span class='value'>{{ item.departments.all|join:", " }}</span></p>{% endif %}