From 3d43716c5ebc2656dd0b6f7e4cd60f351e741b00 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 3 Feb 2017 17:35:24 +0100 Subject: Admin: Archaeological context records: add comment for RelationType --- archaeological_context_records/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archaeological_context_records/admin.py') diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index 0fb2e2c1e..bd2579afb 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -61,7 +61,7 @@ admin.site.register(models.RecordRelations, RecordRelationsAdmin) class RelationTypeAdmin(admin.ModelAdmin): list_display = ('label', 'txt_idx', 'tiny_label', 'available', - 'symmetrical', 'inverse_relation') + 'symmetrical', 'inverse_relation', 'comment') admin.site.register(models.RelationType, RelationTypeAdmin) -- cgit v1.2.3 From 72067746056969f2db9d141998649cab0ff23674 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 3 Feb 2017 20:22:25 +0100 Subject: Admin: Archaeological context records: modify display and label ordering for Unit and IdentificationType --- archaeological_context_records/admin.py | 16 +++++++++++++++- archaeological_context_records/models.py | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'archaeological_context_records/admin.py') diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index bd2579afb..55511a4d5 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -65,7 +65,21 @@ class RelationTypeAdmin(admin.ModelAdmin): 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) + + diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 75074c514..ad6c1a378 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -82,7 +82,7 @@ class Unit(GeneralType): class Meta: verbose_name = _(u"Unit Type") verbose_name_plural = _(u"Unit Types") - ordering = ('order',) + ordering = ('order', 'label') def __unicode__(self): return self.label -- cgit v1.2.3 From 127ce1a820558ba219138d32a41f13671fc99386 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 3 Feb 2017 20:29:45 +0100 Subject: Admin: Archaeological context records: modify display for RelationType --- archaeological_context_records/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archaeological_context_records/admin.py') diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index 55511a4d5..353d75925 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -61,7 +61,7 @@ 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) -- cgit v1.2.3