Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

1 files changed, 13 insertions, 5 deletions

diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 764f63ad3..14b3ffb40 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -59,13 +59,20 @@ admin.site.register(models.Property, PropertyAdmin)
 
 
 class TreatmentAdmin(HistorizedObjectAdmin):
-    list_display = ('location', 'treatment_type', 'container', 'person')
-    list_filter = ('treatment_type',)
+    list_display = ('location', 'treatment_types_lbl', 'container', 'person')
     model = models.Treatment
 
 admin.site.register(models.Treatment, TreatmentAdmin)
 
 
+class TreatmentFileAdmin(HistorizedObjectAdmin):
+    list_display = ('year', 'index', 'name', 'internal_reference')
+    search_fields = ('cached_label',)
+    model = models.TreatmentFile
+
+admin.site.register(models.TreatmentFile, TreatmentFileAdmin)
+
+
 class TreatmentSourceAdmin(admin.ModelAdmin):
     list_display = ('treatment', 'title', 'source_type',)
     list_filter = ('source_type',)
@@ -83,13 +90,14 @@ admin.site.register(models.ObjectType, HierarchicalTypeAdmin)
 
 
 class TreatmentTypeAdmin(admin.ModelAdmin):
-    list_display = GeneralTypeAdmin.list_display + [
-        'virtual', 'upstream_is_many', 'downstream_is_many']
+    list_display = HierarchicalTypeAdmin.list_display + [
+        'order', 'virtual', 'upstream_is_many', 'downstream_is_many']
     model = models.TreatmentType
 admin.site.register(models.TreatmentType, TreatmentTypeAdmin)
 
 general_models = [
     models.ConservatoryState, models.RemarkabilityType,
-    models.PreservationType, models.IntegrityType, ]
+    models.PreservationType, models.IntegrityType,
+    models.TreatmentFileType, models.TreatmentState]
 for model in general_models:
     admin.site.register(model, GeneralTypeAdmin)