summaryrefslogtreecommitdiff
path: root/archaeological_operations/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-04 21:44:27 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-04 21:44:27 +0100
commitcb11379a0928b99e7801710040ac90dd1665b5ef (patch)
tree9f64e921fc66bbe0938e17c1f5325b83c4ccb73b /archaeological_operations/admin.py
parente62d26f17f7f0da10d7bf0f9c7d8895c88002021 (diff)
parent0b0a146fbacde80528b7fb12bfe5719fdef40c85 (diff)
downloadIshtar-cb11379a0928b99e7801710040ac90dd1665b5ef.tar.bz2
Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.zip
Merge branch 'master' into master-importers
Conflicts: ishtar_common/fixtures/initial_importtypes-fr.json
Diffstat (limited to 'archaeological_operations/admin.py')
-rw-r--r--archaeological_operations/admin.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py
index d8ce23662..3abf22eae 100644
--- a/archaeological_operations/admin.py
+++ b/archaeological_operations/admin.py
@@ -105,10 +105,16 @@ class ActTypeAdmin(GeneralTypeAdmin):
list_filter = ('intented_to',)
list_display = ['label', 'txt_idx', 'available', 'intented_to']
-
admin.site.register(models.ActType, ActTypeAdmin)
-general_models = [models.RemainType, models.ReportState]
+
+class ReportStateAdmin(GeneralTypeAdmin):
+ list_display = ['label', 'txt_idx', 'available', 'order', 'comment']
+
+admin.site.register(models.ReportState, ReportStateAdmin)
+
+
+general_models = [models.RemainType]
for model in general_models:
admin.site.register(model, GeneralTypeAdmin)