summaryrefslogtreecommitdiff
path: root/archaeological_finds/models_finds.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-12 16:31:21 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-12 16:37:42 +0100
commit23b0042047d41104887d60083ea8acf6ec50f7d5 (patch)
treeb44bafcabaad1cb9ad72f353444f3e92573c0301 /archaeological_finds/models_finds.py
parent6acabb8565d91e68d3e5e970f288cd29c5614017 (diff)
downloadIshtar-23b0042047d41104887d60083ea8acf6ec50f7d5.tar.bz2
Ishtar-23b0042047d41104887d60083ea8acf6ec50f7d5.zip
Add order in conservatory state type (refs #4321)
Diffstat (limited to 'archaeological_finds/models_finds.py')
-rw-r--r--archaeological_finds/models_finds.py14
1 files changed, 7 insertions, 7 deletions
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)