Merge branch 'master' into master-importers

Conflicts:
	ishtar_common/fixtures/initial_importtypes-fr.json

1 files changed, 16 insertions, 2 deletions

diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py
index bd2579afb..353d75925 100644
--- a/archaeological_context_records/admin.py
+++ b/archaeological_context_records/admin.py
@@ -61,11 +61,25 @@ admin.site.register(models.RecordRelations, RecordRelationsAdmin)
 
 class RelationTypeAdmin(admin.ModelAdmin):
     list_display = ('label', 'txt_idx', 'tiny_label', 'available',
-                    'symmetrical', 'inverse_relation', 'comment')
+                    'symmetrical', 'inverse_relation', 'order', 'comment')
 
 admin.site.register(models.RelationType, RelationTypeAdmin)
 
+class UnitAdmin(admin.ModelAdmin):
+    list_display = ['label', 'txt_idx', 'parent', 'available', 'order', 'comment']
+
+admin.site.register(models.Unit, UnitAdmin)
+
+ 
+class IdentificationTypeAdmin(admin.ModelAdmin):
+    list_display = ['label', 'txt_idx', 'available', 'order', 'comment']
+
+admin.site.register(models.IdentificationType, IdentificationTypeAdmin)
+
+
 general_models = [models.DatingType, models.DatingQuality,
-                  models.Unit, models.ActivityType, models.IdentificationType]
+                  models.ActivityType]
 for model in general_models:
     admin.site.register(model, GeneralTypeAdmin)
+
+