diff options
Diffstat (limited to 'archaeological_operations/admin.py')
| -rw-r--r-- | archaeological_operations/admin.py | 73 |
1 files changed, 29 insertions, 44 deletions
diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py index 0650d4711..68264b97e 100644 --- a/archaeological_operations/admin.py +++ b/archaeological_operations/admin.py @@ -17,10 +17,6 @@ # See the file COPYING for details. -from ajax_select import make_ajax_form -from ajax_select.fields import AutoCompleteSelectField, \ - AutoCompleteSelectMultipleField - from django import forms from django.conf import settings from django.contrib import admin @@ -43,9 +39,7 @@ class AdministrativeActAdmin(HistorizedObjectAdmin): 'in_charge', 'operator', 'scientist', 'signatory', 'associated_file', 'departments_label', 'towns_label'] model = models.AdministrativeAct - form = make_ajax_form( - models.AdministrativeAct, {'operation': 'operation'} - ) + autocomplete_fields = ("operation",) admin_site.register(models.AdministrativeAct, AdministrativeActAdmin) @@ -63,8 +57,7 @@ admin_site.register(models.Period, PeriodAdmin) class OperationInline(admin.TabularInline): model = models.Operation.archaeological_sites.through - form = make_ajax_form( - model, {'operation': 'operation'}) + autocomplete_fields = ("operation",) extra = 1 @@ -73,12 +66,7 @@ class ArchaeologicalSiteAdmin(HistorizedObjectAdmin): search_fields = ('name', 'reference') model = models.ArchaeologicalSite inlines = [OperationInline] - ajax_form_dict = HistorizedObjectAdmin.AJAX_FORM_DICT.copy() - ajax_form_dict.update({ - 'towns': 'town', - }) - form = make_ajax_form( - models.ArchaeologicalSite, ajax_form_dict) + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + ["towns"] exclude = ["documents", "main_image"] @@ -87,8 +75,7 @@ admin_site.register(models.ArchaeologicalSite, ArchaeologicalSiteAdmin) class ArchaeologicalSiteInline(admin.TabularInline): model = models.Operation.archaeological_sites.through - form = make_ajax_form( - model, {'archaeologicalsite': 'archaeological_site'}) + autocomplete_fields = ["archaeologicalsite"] extra = 1 @@ -100,17 +87,6 @@ class AdminOperationForm(forms.ModelForm): widget=OSMWidget) multi_polygon = MultiPolygonField(label=_("Multi polygon"), required=False, widget=OSMWidget) - in_charge = AutoCompleteSelectField('person', required=False) - scientist = AutoCompleteSelectField('person', required=False) - associated_file = AutoCompleteSelectField('file', required=False) - operator = AutoCompleteSelectField('organization', required=False) - collaborators = AutoCompleteSelectMultipleField('person', required=False) - towns = AutoCompleteSelectMultipleField('town', required=False) - archaeological_sites = AutoCompleteSelectMultipleField( - 'archaeological_site', required=False) - if settings.COUNTRY == 'fr': - cira_rapporteur = AutoCompleteSelectField('person', required=False) - lock_user = AutoCompleteSelectField('user', required=False) class OperationAdmin(HistorizedObjectAdmin): @@ -124,6 +100,17 @@ class OperationAdmin(HistorizedObjectAdmin): model = models.Operation readonly_fields = HistorizedObjectAdmin.readonly_fields + [ 'cached_label', 'top_sites'] + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [ + "in_charge", + "scientist", + "associated_file", + "operator", + "collaborators", + "towns", + "archaeological_sites", + "cira_rapporteur", + "lock_user", + ] form = AdminOperationForm inlines = [ArchaeologicalSiteInline] exclude = ["documents", "main_image"] @@ -136,13 +123,13 @@ class ParcelAdmin(MergeActionAdmin, HistorizedObjectAdmin): list_display = ['section', 'parcel_number', 'operation', 'associated_file'] search_fields = ('operation__cached_label', 'associated_file__cached_label', - 'year', 'section', 'parcel_number') + 'year', 'section', 'parcel_number', 'town__name') model = models.Parcel - form = make_ajax_form( - model, {'associated_file': 'file', - 'operation': 'operation', - 'town': 'town'} - ) + autocomplete_fields = [ + 'associated_file', + 'operation', + 'town', + ] readonly_fields = HistorizedObjectAdmin.readonly_fields + [ 'history_date' ] @@ -157,9 +144,10 @@ class RecordRelationsAdmin(admin.ModelAdmin): model = models.RecordRelations search_fields = ['left_record__cached_label', 'right_record__cached_label'] - form = make_ajax_form( - model, {'left_record': 'operation', - 'right_record': 'operation'}) + autocomplete_fields = [ + 'left_record', + 'right_record' + ] admin_site.register(models.RecordRelations, RecordRelationsAdmin) @@ -204,10 +192,9 @@ class ParcelOwnerAdmin(HistorizedObjectAdmin): 'owner__name', 'owner__surname', 'parcel__section', 'parcel__parcel_number') model = models.ParcelOwner - form = make_ajax_form( - model, {'owner': 'person', - 'parcel': 'parcel'} - ) + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [ + "owner", "parcel" + ] readonly_fields = HistorizedObjectAdmin.readonly_fields + [ 'history_date' ] @@ -219,9 +206,7 @@ admin_site.register(models.ParcelOwner, ParcelOwnerAdmin) class CulturalAttributionTypeAdmin(GeneralTypeAdmin): search_fields = ('label', 'parent__label', ) model = models.CulturalAttributionType - form = make_ajax_form(model, { - 'parent': 'cultural_attribution_type', - }) + autocomplete_fields = ['parent'] admin_site.register(models.CulturalAttributionType, |