Geaovectordata - admin: autocomplete for geodata items

1 files changed, 5 insertions, 20 deletions

diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index f56c108d8..98c86141b 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -17,36 +17,21 @@
 
 # See the file COPYING for details.
 
-from django import forms
 from django.contrib import admin
-from django.contrib.gis.forms import PointField, MultiPolygonField, \
-    LineStringField, OSMWidget
-from ishtar_common.utils import ugettext_lazy as _
 
 from ishtar_common.apps import admin_site
-from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin, MainGeoDataItem
 
 from . import models
 
 
-class AdminBaseFindForm(forms.ModelForm):
-    class Meta:
-        model = models.BaseFind
-        exclude = []
-    point_2d = PointField(label=_("Point (2D)"), required=False,
-                          widget=OSMWidget)
-    line = LineStringField(label=_("Line"), required=False,
-                           widget=OSMWidget)
-    multi_polygon = MultiPolygonField(label=_("Multi polygon"), required=False,
-                                      widget=OSMWidget)
-
-
-class BaseFindAdmin(HistorizedObjectAdmin):
+class BaseFindAdmin(HistorizedObjectAdmin, MainGeoDataItem):
     list_display = ('label', 'context_record', 'index')
     search_fields = ('label', 'cache_complete_id',)
+    exclude = ["line"]
     model = models.BaseFind
-    form = AdminBaseFindForm
-    autocomplete_fields = ("context_record",)
+    autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + \
+                          MainGeoDataItem.autocomplete_fields + ["context_record"]
     readonly_fields = HistorizedObjectAdmin.readonly_fields + [
         'cache_short_id', 'cache_complete_id',
     ]