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_finds | |
parent | 650b7eb8b124a7257d14eb20ee1b9e17fbd8e8ea (diff) | |
parent | 924a81fbacac149db747294da64370dafc45043e (diff) | |
download | Ishtar-9c94fdd38c92e349ee299270226a2adc5e68f97b.tar.bz2 Ishtar-9c94fdd38c92e349ee299270226a2adc5e68f97b.zip |
Merge branch 'master' into develop
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 |