summaryrefslogtreecommitdiff
path: root/archaeological_finds/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-07-12 13:12:48 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-07-12 13:12:48 +0200
commit267925c88d3880fd59278073b3f9808f5d89a9e6 (patch)
tree22e64211f860463583d7a58330f44292916992f1 /archaeological_finds/models.py
parentdfffe52ea90a20a8ae0b786b464429a9413fc83c (diff)
parent3c946f40c7d5d04431074cb22b1522dc519da69e (diff)
downloadIshtar-267925c88d3880fd59278073b3f9808f5d89a9e6.tar.bz2
Ishtar-267925c88d3880fd59278073b3f9808f5d89a9e6.zip
Merge branch 'master' into master-WIP-treatments
Diffstat (limited to 'archaeological_finds/models.py')
-rw-r--r--archaeological_finds/models.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index f6483e989..7d4eadbf6 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -297,6 +297,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
conservatory_state = models.ForeignKey(
ConservatoryState, verbose_name=_(u"Conservatory state"), blank=True,
null=True)
+ conservatory_comment = models.TextField(_(u"Conservatory comment"),
+ blank=True, null=True)
preservation_to_considers = models.ManyToManyField(
PreservationType, verbose_name=_(u"Type of preservation to consider"),
related_name='finds')
@@ -327,6 +329,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
width = models.FloatField(_(u"Width (cm)"), blank=True, null=True)
height = models.FloatField(_(u"Height (cm)"), blank=True, null=True)
diameter = models.FloatField(_(u"Diameter (cm)"), blank=True, null=True)
+ dimensions_comment = models.TextField(_(u"Dimensions comment"),
+ blank=True, null=True)
mark = models.TextField(_(u"Mark"), blank=True, null=True)
comment = models.TextField(_(u"Comment"), blank=True, null=True)
dating_comment = models.TextField(_(u"Comment on dating"), blank=True,