Add many fields to finds - associated migrations, forms and autocomplete view (refs #2784)

1 files changed, 10 insertions, 3 deletions

diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 6e73e7ec0..f149f9397 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -17,13 +17,13 @@
 
 # See the file COPYING for details.
 
-from django.conf import settings
 from django.contrib import admin
 
 from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
 
 import models
 
+
 class BaseFindAdmin(HistorizedObjectAdmin):
     list_display = ('label', 'context_record', 'is_isolated')
     search_fields = ('label', 'context_record__parcel__operation__name',)
@@ -31,6 +31,7 @@ class BaseFindAdmin(HistorizedObjectAdmin):
 
 admin.site.register(models.BaseFind, BaseFindAdmin)
 
+
 class FindAdmin(HistorizedObjectAdmin):
     list_display = ('label', 'material_type', 'dating', 'volume', 'weight',
                     'find_number',)
@@ -40,6 +41,7 @@ class FindAdmin(HistorizedObjectAdmin):
 
 admin.site.register(models.Find, FindAdmin)
 
+
 class FindSourceAdmin(admin.ModelAdmin):
     list_display = ('find', 'title', 'source_type',)
     list_filter = ('source_type',)
@@ -48,6 +50,7 @@ class FindSourceAdmin(admin.ModelAdmin):
 
 admin.site.register(models.FindSource, FindSourceAdmin)
 
+
 class PropertyAdmin(admin.ModelAdmin):
     list_display = ['find', 'person', 'start_date', 'end_date']
     search_fields = ('find__label', 'person__name')
@@ -55,6 +58,7 @@ class PropertyAdmin(admin.ModelAdmin):
 
 admin.site.register(models.Property, PropertyAdmin)
 
+
 class TreatmentAdmin(HistorizedObjectAdmin):
     list_display = ('location', 'treatment_type', 'container', 'person')
     list_filter = ('treatment_type',)
@@ -62,6 +66,7 @@ class TreatmentAdmin(HistorizedObjectAdmin):
 
 admin.site.register(models.Treatment, TreatmentAdmin)
 
+
 class TreatmentSourceAdmin(admin.ModelAdmin):
     list_display = ('treatment', 'title', 'source_type',)
     list_filter = ('source_type',)
@@ -70,10 +75,12 @@ class TreatmentSourceAdmin(admin.ModelAdmin):
 
 admin.site.register(models.TreatmentSource, TreatmentSourceAdmin)
 
-class MaterialTypeAdmin(admin.ModelAdmin):
+
+class HierarchicalTypeAdmin(admin.ModelAdmin):
     list_display = ['label', 'txt_idx', 'parent', 'available']
 
-admin.site.register(models.MaterialType, MaterialTypeAdmin)
+admin.site.register(models.MaterialType, HierarchicalTypeAdmin)
+admin.site.register(models.ObjectType, HierarchicalTypeAdmin)
 
 general_models = [models.TreatmentType, models.ConservatoryState]
 for model in general_models: