diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-30 17:47:37 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-30 17:47:37 +0100 |
| commit | 9c94fdd38c92e349ee299270226a2adc5e68f97b (patch) | |
| tree | a1eeb48045bb8698b25c034a5775f1898a43fb29 /archaeological_operations | |
| parent | 650b7eb8b124a7257d14eb20ee1b9e17fbd8e8ea (diff) | |
| parent | 924a81fbacac149db747294da64370dafc45043e (diff) | |
| download | Ishtar-9c94fdd38c92e349ee299270226a2adc5e68f97b.tar.bz2 Ishtar-9c94fdd38c92e349ee299270226a2adc5e68f97b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/admin.py | 5 |
1 files changed, 2 insertions, 3 deletions
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') |