Add order in conservatory state type (refs #4321)

3 files changed, 48 insertions, 8 deletions

diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 7ab92475f..1513c7eeb 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -171,8 +171,14 @@ class CheckedTypeAdmin(GeneralTypeAdmin):
 
 admin_site.register(models.CheckedType, CheckedTypeAdmin)
 
+
+@admin.register(models.ConservatoryState, site=admin_site)
+class ConservatoryStateAdmin(GeneralTypeAdmin):
+    list_display = GeneralTypeAdmin.list_display + ['order']
+
+
 general_models = [
-    models.ConservatoryState, models.RemarkabilityType,
+    models.RemarkabilityType,
     models.IntegrityType,
     models.TreatmentFileType, models.TreatmentState,
     models.BatchType, models.AlterationCauseType, models.AlterationType,
diff --git a/archaeological_finds/migrations/0038_auto_20181112_1625.py b/archaeological_finds/migrations/0038_auto_20181112_1625.py
new file mode 100644
index 000000000..d7a184e85
--- /dev/null
+++ b/archaeological_finds/migrations/0038_auto_20181112_1625.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-11-12 16:25
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_finds', '0037_auto_20181018_1756'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='conservatorystate',
+            options={'ordering': ('order', 'label'), 'verbose_name': 'Conservatory state type', 'verbose_name_plural': 'Conservatory state types'},
+        ),
+        migrations.AlterModelOptions(
+            name='treatmenttype',
+            options={'ordering': ('order', 'label'), 'verbose_name': 'Treatment type', 'verbose_name_plural': 'Treatment types'},
+        ),
+        migrations.AddField(
+            model_name='conservatorystate',
+            name='order',
+            field=models.IntegerField(default=10, verbose_name='Order'),
+        ),
+        migrations.AlterField(
+            model_name='treatmenttype',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_finds.TreatmentType', verbose_name='Parent'),
+        ),
+    ]
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index fd22be34c..2dd2b63a1 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -76,20 +76,20 @@ post_delete.connect(post_save_cache, sender=MaterialTypeQualityType)
 
 
 class ConservatoryState(HierarchicalType):
+    order = models.IntegerField(_(u"Order"), default=10)
+
     class Meta:
-        verbose_name = _(u"Conservatory state")
-        verbose_name_plural = _(u"Conservatory states")
-        ordering = ('label',)
+        verbose_name = _(u"Conservatory state type")
+        verbose_name_plural = _(u"Conservatory state types")
+        ordering = ('order', 'label',)
 
 
 post_save.connect(post_save_cache, sender=ConservatoryState)
 post_delete.connect(post_save_cache, sender=ConservatoryState)
 
 
-class TreatmentType(GeneralType):
+class TreatmentType(HierarchicalType):
     order = models.IntegerField(_(u"Order"), default=10)
-    parent = models.ForeignKey("TreatmentType", verbose_name=_(u"Parent type"),
-                               blank=True, null=True)
     virtual = models.BooleanField(_(u"Virtual"))
     upstream_is_many = models.BooleanField(
         _(u"Upstream is many"), default=False,
@@ -105,7 +105,7 @@ class TreatmentType(GeneralType):
     class Meta:
         verbose_name = _(u"Treatment type")
         verbose_name_plural = _(u"Treatment types")
-        ordering = ('label',)
+        ordering = ('order', 'label',)
 
 
 post_save.connect(post_save_cache, sender=TreatmentType)