diff options
| -rw-r--r-- | archaeological_context_records/admin.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/admin.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/admin.py | 5 | ||||
| -rw-r--r-- | archaeological_warehouse/admin.py | 2 | ||||
| -rw-r--r-- | ishtar_common/admin.py | 22 |
5 files changed, 17 insertions, 20 deletions
diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index d5e4d09b9..b966628ae 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -93,21 +93,21 @@ class RecordRelationsAdmin(admin.ModelAdmin): admin_site.register(models.RecordRelations, RecordRelationsAdmin) -class RelationTypeAdmin(admin.ModelAdmin): +class RelationTypeAdmin(GeneralTypeAdmin): list_display = ('label', 'txt_idx', 'tiny_label', 'available', 'symmetrical', 'inverse_relation', 'order', 'comment') admin_site.register(models.RelationType, RelationTypeAdmin) -class UnitAdmin(admin.ModelAdmin): +class UnitAdmin(GeneralTypeAdmin): list_display = ['label', 'txt_idx', 'parent', 'available', 'order', 'comment'] admin_site.register(models.Unit, UnitAdmin) -class IdentificationTypeAdmin(admin.ModelAdmin): +class IdentificationTypeAdmin(GeneralTypeAdmin): list_display = ['label', 'txt_idx', 'available', 'order', 'comment'] admin_site.register(models.IdentificationType, IdentificationTypeAdmin) diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py index 6f32365b9..e2348458b 100644 --- a/archaeological_finds/admin.py +++ b/archaeological_finds/admin.py @@ -173,7 +173,7 @@ class MaterialTypeAdmin(HierarchicalTypeAdmin): admin_site.register(models.MaterialType, MaterialTypeAdmin) -class TreatmentTypeAdmin(admin.ModelAdmin): +class TreatmentTypeAdmin(GeneralTypeAdmin): list_display = HierarchicalTypeAdmin.list_display + [ 'order', 'virtual', 'upstream_is_many', 'downstream_is_many'] model = models.TreatmentType diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py index 53c931971..b9a13ec64 100644 --- a/archaeological_operations/admin.py +++ b/archaeological_operations/admin.py @@ -50,13 +50,12 @@ class AdministrativeActAdmin(HistorizedObjectAdmin): admin_site.register(models.AdministrativeAct, AdministrativeActAdmin) -class PeriodAdmin(admin.ModelAdmin): +class PeriodAdmin(GeneralTypeAdmin): list_display = ('label', 'start_date', 'end_date', 'parent', 'available', 'order') list_filter = ('parent',) model = models.Period - admin_site.register(models.Period, PeriodAdmin) @@ -169,7 +168,7 @@ class RecordRelationsAdmin(admin.ModelAdmin): admin_site.register(models.RecordRelations, RecordRelationsAdmin) -class RelationTypeAdmin(admin.ModelAdmin): +class RelationTypeAdmin(GeneralTypeAdmin): list_display = ('label', 'txt_idx', 'tiny_label', 'available', 'symmetrical', 'inverse_relation', 'comment') diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py index f2b44fcf0..7cd222e80 100644 --- a/archaeological_warehouse/admin.py +++ b/archaeological_warehouse/admin.py @@ -41,7 +41,7 @@ class WarehouseAdmin(HistorizedObjectAdmin): admin_site.register(models.Warehouse, WarehouseAdmin) -class ContainerTypeAdmin(admin.ModelAdmin): +class ContainerTypeAdmin(GeneralTypeAdmin): list_display = ('label', 'reference', 'length', 'width', 'height', 'volume') model = models.ContainerType diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index d3292148f..aff6b0833 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -239,27 +239,18 @@ class AuthorAdmin(admin.ModelAdmin): admin_site.register(models.Author, AuthorAdmin) -class PersonTypeAdmin(admin.ModelAdmin): - list_display = ['label', 'txt_idx', 'available', 'comment'] - model = models.PersonType - filter_vertical = ('groups',) - -admin_site.register(models.PersonType, PersonTypeAdmin) - - class GlobalVarAdmin(admin.ModelAdmin): list_display = ['slug', 'description', 'value'] admin_site.register(models.GlobalVar, GlobalVarAdmin) -class GeneralTypeAdmin(admin.ModelAdmin): +class GeneralTypeAdmin(GeneralTypeAdmin): list_display = ['label', 'txt_idx', 'available', 'comment'] search_fields = ('label', 'txt_idx', 'comment',) actions = ['import_generic', export_as_csv_action()] prepopulated_fields = {"txt_idx": ("label",)} import_generic = gen_import_generic - general_models = [models.OrganizationType, models.SourceType, models.AuthorType, models.TitleType, models.Format, models.SupportType] @@ -267,6 +258,13 @@ for model in general_models: admin_site.register(model, GeneralTypeAdmin) +class PersonTypeAdmin(GeneralTypeAdmin): + model = models.PersonType + filter_vertical = ('groups',) + +admin_site.register(models.PersonType, PersonTypeAdmin) + + class ImporterDefaultValuesInline(admin.TabularInline): model = models.ImporterDefaultValues @@ -278,7 +276,7 @@ class ImporterDefaultAdmin(admin.ModelAdmin): admin_site.register(models.ImporterDefault, ImporterDefaultAdmin) -class ImporterTypeAdmin(admin.ModelAdmin): +class ImporterTypeAdmin(GeneralTypeAdmin): list_display = ('name', 'associated_models', 'available') admin_site.register(models.ImporterType, ImporterTypeAdmin) @@ -322,7 +320,7 @@ class ImporterModelAdmin(admin.ModelAdmin): admin_site.register(models.ImporterModel, ImporterModelAdmin) -class FormaterTypeAdmin(admin.ModelAdmin): +class FormaterTypeAdmin(GeneralTypeAdmin): list_display = ('formater_type', 'options') admin_site.register(models.FormaterType, FormaterTypeAdmin) |