diff options
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/admin.py | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py index 68264b97e..39c5ba490 100644 --- a/archaeological_operations/admin.py +++ b/archaeological_operations/admin.py @@ -17,15 +17,12 @@ # See the file COPYING for details. -from django import forms from django.conf import settings from django.contrib import admin -from django.contrib.gis.forms import PointField, MultiPolygonField, OSMWidget -from ishtar_common.utils import ugettext_lazy as _ from ishtar_common.apps import admin_site from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin, \ - MergeActionAdmin + MergeActionAdmin, MainGeoDataItem from . import models @@ -61,12 +58,13 @@ class OperationInline(admin.TabularInline): extra = 1 -class ArchaeologicalSiteAdmin(HistorizedObjectAdmin): +class ArchaeologicalSiteAdmin(HistorizedObjectAdmin, MainGeoDataItem): list_display = ('name', 'reference') search_fields = ('name', 'reference') model = models.ArchaeologicalSite inlines = [OperationInline] - autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + ["towns"] + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + \ + MainGeoDataItem.autocomplete_fields + ["towns"] exclude = ["documents", "main_image"] @@ -79,17 +77,7 @@ class ArchaeologicalSiteInline(admin.TabularInline): extra = 1 -class AdminOperationForm(forms.ModelForm): - class Meta: - model = models.Operation - exclude = [] - point = PointField(label=_("Point"), required=False, - widget=OSMWidget) - multi_polygon = MultiPolygonField(label=_("Multi polygon"), required=False, - widget=OSMWidget) - - -class OperationAdmin(HistorizedObjectAdmin): +class OperationAdmin(HistorizedObjectAdmin, MainGeoDataItem): list_display = ['year', 'operation_code', 'operation_type', 'common_name'] list_filter = ("operation_type", "year",) @@ -100,7 +88,8 @@ class OperationAdmin(HistorizedObjectAdmin): model = models.Operation readonly_fields = HistorizedObjectAdmin.readonly_fields + [ 'cached_label', 'top_sites'] - autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [ + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + \ + MainGeoDataItem.autocomplete_fields + [ "in_charge", "scientist", "associated_file", @@ -111,7 +100,6 @@ class OperationAdmin(HistorizedObjectAdmin): "cira_rapporteur", "lock_user", ] - form = AdminOperationForm inlines = [ArchaeologicalSiteInline] exclude = ["documents", "main_image"] |