diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 17:57:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 17:57:28 +0100 |
| commit | 6979f76c94daae084eb0c5525e1a65734c97555f (patch) | |
| tree | 4d94e87afaecbd96e5cb317ce019c84020f97895 /archaeological_finds/admin.py | |
| parent | b60a1e62355695783e25b0f8054aaab7d40b73e0 (diff) | |
| parent | 29a7c801110121f51268df69fbe604b116d44472 (diff) | |
| download | Ishtar-6979f76c94daae084eb0c5525e1a65734c97555f.tar.bz2 Ishtar-6979f76c94daae084eb0c5525e1a65734c97555f.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_finds/admin.py')
| -rw-r--r-- | archaeological_finds/admin.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py index 14b3ffb40..3d8aed855 100644 --- a/archaeological_finds/admin.py +++ b/archaeological_finds/admin.py @@ -83,12 +83,17 @@ admin.site.register(models.TreatmentSource, TreatmentSourceAdmin) class HierarchicalTypeAdmin(GeneralTypeAdmin): - list_display = ['label', 'txt_idx', 'parent', 'available'] + list_display = ['label', 'txt_idx', 'parent', 'available', 'comment'] -admin.site.register(models.MaterialType, HierarchicalTypeAdmin) admin.site.register(models.ObjectType, HierarchicalTypeAdmin) +class MaterialTypeAdmin(HierarchicalTypeAdmin): + list_display = HierarchicalTypeAdmin.list_display + ['recommendation'] + +admin.site.register(models.MaterialType, MaterialTypeAdmin) + + class TreatmentTypeAdmin(admin.ModelAdmin): list_display = HierarchicalTypeAdmin.list_display + [ 'order', 'virtual', 'upstream_is_many', 'downstream_is_many'] |