diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-30 17:48:11 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-30 17:48:11 +0100 |
| commit | 2e82a77e11a9d1e79877e24c018f5abed4da6ee2 (patch) | |
| tree | f7731b185b5335890cd020a871e5c78aaa5cec67 /archaeological_finds | |
| parent | 52883f6f5d58dbe4adc9f47e0fdc969c62efb392 (diff) | |
| parent | 915e96df0a9d8c1328f504728d096e60cdc4851c (diff) | |
| download | Ishtar-2e82a77e11a9d1e79877e24c018f5abed4da6ee2.tar.bz2 Ishtar-2e82a77e11a9d1e79877e24c018f5abed4da6ee2.zip | |
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/admin.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |