3 files changed, 25 insertions, 14 deletions
diff --git a/archaeological_files/admin.py b/archaeological_files/admin.py
index 58c1791c0..b5709bd65 100644
--- a/archaeological_files/admin.py
+++ b/archaeological_files/admin.py
@@ -35,22 +35,26 @@ class FileAdmin(HistorizedObjectAdmin):
     if settings.COUNTRY == 'fr':
         list_filter += ['saisine_type']
     search_fields = ('name', 'towns__name', 'permit_reference')
+    ajax_form_dict = HistorizedObjectAdmin.AJAX_FORM_DICT.copy()
+    ajax_form_dict.update({
+        'in_charge': 'person',
+        'general_contractor': 'person',
+        'corporation_general_contractor': 'organization',
+        'responsible_town_planning_service': 'person',
+        'planning_service': 'organization',
+        'organization': 'organization',
+        'scientist': 'person',
+        'main_town': 'town',
+        'towns': 'town',
+        'related_file': 'file'
+    })
     form = make_ajax_form(
-        models.File, {'in_charge': 'person',
-                      'general_contractor': 'person',
-                      'corporation_general_contractor': 'organization',
-                      'responsible_town_planning_service': 'person',
-                      'planning_service': 'organization',
-                      'organization': 'organization',
-                      'scientist': 'person',
-                      'main_town': 'town',
-                      'towns': 'town',
-                      'related_file': 'file'
-                      })
+        models.File, ajax_form_dict)
     readonly_fields = HistorizedObjectAdmin.readonly_fields + [
         'raw_general_contractor', 'raw_town_planning_service',
         'cached_label', 'imported_line'
     ]
+    exclude = ["documents", "main_image"]
     model = models.File
 
 
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 9a2f63a1d..a9936c47a 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -37,8 +37,8 @@ from archaeological_operations.models import ActType, AdministrativeAct, \
 from . import models
 
 from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect, \
-    ManageOldType, CustomForm, FieldType, IshtarForm, HistorySelect, \
-    MultiSearchForm, LockForm, CustomFormSearch
+    ManageOldType, CustomForm, FieldType, IshtarForm, \
+    MultiSearchForm, LockForm, CustomFormSearch, DocumentItemSelect
 from ishtar_common.forms_common import get_town_field
 from archaeological_operations.forms import AdministrativeActForm, \
     AdministrativeActOpeFormSelection, SLICING, AdministrativeActModifForm, \
@@ -47,7 +47,7 @@ from ishtar_common import widgets
 from bootstrap_datepicker.widgets import DatePicker
 
 
-class FileSelect(HistorySelect):
+class FileSelect(DocumentItemSelect):
     _model = models.File
     form_admin_name = _(u"File - 001 - Search")
     form_slug = "file-001-search"
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 018b5d429..310301c59 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -161,6 +161,12 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         'towns_label': _(u"Towns"),
     }
 
+    REVERSED_BOOL_FIELDS = [
+        'documents__image__isnull',
+        'documents__associated_file__isnull',
+        'documents__associated_url__isnull',
+    ]
+
     # alternative names of fields for searches
     ALT_NAMES = {
         'year': SearchAltName(
@@ -230,6 +236,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         ),
     }
     ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
+    ALT_NAMES.update(DocumentItem.ALT_NAMES)
 
     POST_PROCESS_REQUEST = {
         'towns__numero_insee__startswith': '_get_department_code',