diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 09:57:02 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 10:33:16 +0100 |
| commit | 43ae3f7a4870fac32fb2d10874ad539364aee66f (patch) | |
| tree | 99c28890ccda877f8a906c6233fdabd1bec002ed /archaeological_finds/models_finds.py | |
| parent | efebfe2dbcd7b8984c630069fcde6611bacf36d5 (diff) | |
| download | Ishtar-43ae3f7a4870fac32fb2d10874ad539364aee66f.tar.bz2 Ishtar-43ae3f7a4870fac32fb2d10874ad539364aee66f.zip | |
Finds: batch is now a real type (refs #3435)
Diffstat (limited to 'archaeological_finds/models_finds.py')
| -rw-r--r-- | archaeological_finds/models_finds.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index bbb74e4f3..c8903fc10 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -93,6 +93,16 @@ post_save.connect(post_save_cache, sender=RemarkabilityType) post_delete.connect(post_save_cache, sender=RemarkabilityType) +class BatchType(GeneralType): + order = models.IntegerField(_(u"Order"), default=10) + class Meta: + verbose_name = _(u"Batch type") + verbose_name_plural = _(u"Batch types") + ordering = ('order',) +post_save.connect(post_save_cache, sender=BatchType) +post_delete.connect(post_save_cache, sender=BatchType) + + class ObjectType(GeneralType): parent = models.ForeignKey("ObjectType", blank=True, null=True, verbose_name=_(u"Parent")) @@ -115,15 +125,8 @@ class ObjectType(GeneralType): post_save.connect(post_save_cache, sender=ObjectType) post_delete.connect(post_save_cache, sender=ObjectType) -IS_ISOLATED_CHOICES = ( - ('U', _(u"Unknow")), - ('O', _(u"Object")), - ('B', _(u"Batch")) -) - class BaseFind(BaseHistorizedItem, OwnPerms): - IS_ISOLATED_DICT = dict(IS_ISOLATED_CHOICES) label = models.TextField(_(u"Free ID")) external_id = models.TextField(_(u"External ID"), blank=True, null=True) auto_external_id = models.BooleanField( @@ -137,8 +140,8 @@ class BaseFind(BaseHistorizedItem, OwnPerms): verbose_name=_(u"Context Record")) discovery_date = models.DateField(_(u"Discovery date"), blank=True, null=True) - batch = models.CharField(_(u"Batch/object"), max_length=1, default="U", - choices=IS_ISOLATED_CHOICES) + batch = models.ForeignKey(BatchType, verbose_name=_(u"Batch/object"), + blank=True, null=True) index = models.IntegerField(u"Index", default=0) material_index = models.IntegerField(_(u"Material index"), default=0) topographic_localisation = models.CharField( |