Admin: for all hierarchical type lists add a colum for parent (refs #4956)

1 files changed, 13 insertions, 12 deletions

diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 1da39ed82..00f5501b5 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -28,8 +28,7 @@ from django.contrib.gis.forms import PointField, MultiPolygonField, \
 from ishtar_common.utils import ugettext_lazy as _
 
 from ishtar_common.apps import admin_site
-from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin, \
-    HierarchicalTypeAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
 
 from . import models
 
@@ -181,7 +180,7 @@ class TreatmentFileAdmin(HistorizedObjectAdmin):
 admin_site.register(models.TreatmentFile, TreatmentFileAdmin)
 
 
-class ObjectTypeAdmin(HierarchicalTypeAdmin):
+class ObjectTypeAdmin(GeneralTypeAdmin):
     model = models.ObjectType
     form = make_ajax_form(model, {
         'parent': 'object_type',
@@ -191,24 +190,22 @@ class ObjectTypeAdmin(HierarchicalTypeAdmin):
 admin_site.register(models.ObjectType, ObjectTypeAdmin)
 
 
-class MaterialTypeAdmin(HierarchicalTypeAdmin):
-    list_display = HierarchicalTypeAdmin.list_display + ['recommendation']
+class MaterialTypeAdmin(GeneralTypeAdmin):
     search_fields = ('label', 'parent__label', 'comment',)
     model = models.MaterialType
     form = make_ajax_form(model, {
         'parent': 'material_type',
     })
+    extra_list_display = ['recommendation']
 
 
 admin_site.register(models.MaterialType, MaterialTypeAdmin)
 
 
-admin_site.register(models.CommunicabilityType, HierarchicalTypeAdmin)
+admin_site.register(models.CommunicabilityType, GeneralTypeAdmin)
 
 
 class TreatmentTypeAdmin(GeneralTypeAdmin):
-    list_display = HierarchicalTypeAdmin.list_display[:-1] + ['order'] + \
-                   [HierarchicalTypeAdmin.list_display[-1]]
     list_filter = [
         'virtual', 'destructive', 'create_new_find', 'upstream_is_many',
         'downstream_is_many', 'destructive', 'change_reference_location',
@@ -216,12 +213,16 @@ class TreatmentTypeAdmin(GeneralTypeAdmin):
     ]
     model = models.TreatmentType
 
+    def get_list_display(self, request):
+        list_display = super(TreatmentTypeAdmin, self).get_list_display(request)
+        return list_display[:-1] + ['order'] + [list_display[-1]]
+
 
 admin_site.register(models.TreatmentType, TreatmentTypeAdmin)
 
 
 class CheckedTypeAdmin(GeneralTypeAdmin):
-    list_display = GeneralTypeAdmin.list_display + ['order']
+    extra_list_display = ["order"]
     model = models.CheckedType
 
 
@@ -230,17 +231,17 @@ admin_site.register(models.CheckedType, CheckedTypeAdmin)
 
 @admin.register(models.ConservatoryState, site=admin_site)
 class ConservatoryStateAdmin(GeneralTypeAdmin):
-    list_display = GeneralTypeAdmin.list_display + ['order']
+    extra_list_display = ["order"]
 
 
 @admin.register(models.TreatmentFileType, site=admin_site)
 class TreatmentFileType(GeneralTypeAdmin):
-    list_display = GeneralTypeAdmin.list_display + ["treatment_type"]
+    extra_list_display = ["treatment_type"]
 
 
 @admin.register(models.TreatmentState, site=admin_site)
 class TreatmentState(GeneralTypeAdmin):
-    list_display = GeneralTypeAdmin.list_display[:-1] + ["order", "executed"]
+    extra_list_display = ["order", "executed"]
 
 
 general_models = [