diff options
| 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 |
| commit | 6faa87a30294b0f555602f2738858cb078647236 (patch) | |
| tree | 22e64211f860463583d7a58330f44292916992f1 /archaeological_finds/models.py | |
| parent | bcf6241a42958c3364578aad2dc0283f10100e3e (diff) | |
| parent | 1821e59c0d60dff25ce06a6d8f477c6ce614f22a (diff) | |
| download | Ishtar-6faa87a30294b0f555602f2738858cb078647236.tar.bz2 Ishtar-6faa87a30294b0f555602f2738858cb078647236.zip | |
Merge branch 'master' into master-WIP-treatments
Diffstat (limited to 'archaeological_finds/models.py')
| -rw-r--r-- | archaeological_finds/models.py | 4 |
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, |