Admin: improve files and common

* Town admin: OSM overlay
* add a File lookup
* improve considerably File edition (make it usable)

3 files changed, 57 insertions, 6 deletions

diff --git a/archaeological_files/admin.py b/archaeological_files/admin.py
index f341dec41..525f7e840 100644
--- a/archaeological_files/admin.py
+++ b/archaeological_files/admin.py
@@ -17,6 +17,8 @@
 
 # See the file COPYING for details.
 
+from ajax_select import make_ajax_form
+
 from django.conf import settings
 
 from ishtar_common.apps import admin_site
@@ -26,12 +28,29 @@ import models
 
 
 class FileAdmin(HistorizedObjectAdmin):
-    list_display = ['year', 'numeric_reference', 'internal_reference',
-                    'end_date', 'file_type', 'general_contractor']
+    list_display = ['year', 'numeric_reference', 'file_type', 'name']
     if settings.COUNTRY == 'fr':
         list_display += ['saisine_type', 'permit_reference']
-    list_filter = ("file_type", "year",)
-    search_fields = ('towns__name',)
+    list_filter = ["file_type", "year"]
+    if settings.COUNTRY == 'fr':
+        list_filter += ['saisine_type']
+    search_fields = ('name', 'towns__name', 'permit_reference')
+    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'
+                      })
+    readonly_fields = HistorizedObjectAdmin.readonly_fields + [
+        'raw_general_contractor', 'raw_town_planning_service', 'imports',
+        'cached_label', 'imported_line'
+    ]
     model = models.File
 
 admin_site.register(models.File, FileAdmin)
diff --git a/archaeological_files/lookups.py b/archaeological_files/lookups.py
new file mode 100644
index 000000000..4de713419
--- /dev/null
+++ b/archaeological_files/lookups.py
@@ -0,0 +1,32 @@
+from ajax_select import register, LookupChannel
+
+from django.db.models import Q
+from archaeological_files.models import File
+
+
+@register('file')
+class FileLookup(LookupChannel):
+    model = File
+
+    def get_query(self, q, request):
+        query = Q()
+        for term in q.strip().split(' '):
+             subquery = (
+                Q(towns__name__icontains=term) |
+                Q(towns__numero_insee__icontains=term) |
+                Q(main_town__name__icontains=term) |
+                Q(main_town__numero_insee__icontains=term) |
+                Q(name__icontains=term) |
+                Q(internal_reference__icontains=term) |
+                Q(permit_reference__icontains=term)
+             )
+             try:
+                 num = int(term)
+                 subquery |=   Q(year=num) | Q(numeric_reference=num)
+             except ValueError:
+                 pass
+             query &= subquery
+        return self.model.objects.filter(query).order_by('cached_label')[:20]
+
+    def format_item_display(self, item):
+        return u"<span class='ajax-label'>%s</span>" % item.cached_label
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index a9a277280..0d5b4b3e8 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -151,10 +151,10 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
     permit_reference = models.TextField(_(u"Permit reference"), blank=True,
                                         null=True)
     end_date = models.DateField(_(u"Closing date"), null=True, blank=True)
-    main_town = models.ForeignKey(Town, verbose_name=_(u"Town"), null=True,
+    main_town = models.ForeignKey(Town, verbose_name=_(u"Main town"), null=True,
                                   blank=True, related_name='file_main')
     towns = models.ManyToManyField(Town, verbose_name=_(u"Towns"),
-                                   related_name='file')
+                                   related_name='file', blank=True)
     creation_date = models.DateField(
         _(u"Creation date"), default=datetime.date.today, blank=True,
         null=True)