diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-22 13:41:02 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-22 13:41:02 +0200 |
| commit | dafc5d16f3095bad00356b6198afcd5bbeab61d6 (patch) | |
| tree | 7040d1fd325ba67b890122059a8f50a3857e332a /archaeological_context_records/forms.py | |
| parent | 64bb69c03ce1688c72b3f7ebd0e1550cd941aa69 (diff) | |
| parent | 0ecd905165193897129a71a1e8203232f0b2b68c (diff) | |
| download | Ishtar-dafc5d16f3095bad00356b6198afcd5bbeab61d6.tar.bz2 Ishtar-dafc5d16f3095bad00356b6198afcd5bbeab61d6.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_context_records/forms.py')
| -rw-r--r-- | archaeological_context_records/forms.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 4a5267654..72cb24097 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -145,6 +145,8 @@ class RecordFormGeneral(ManageOldType, forms.Form): thickness = forms.FloatField(label=_(u"Thickness (m)"), required=False) depth = forms.FloatField(label=_(u"Depth (m)"), required=False) unit = forms.ChoiceField(label=_("Unit"), required=False, choices=[]) + has_furniture = forms.NullBooleanField(label=_(u"Has furniture?"), + required=False) location = forms.CharField( label=_(u"Location"), widget=forms.Textarea, required=False, validators=[validators.MaxLengthValidator(200)]) @@ -154,7 +156,7 @@ class RecordFormGeneral(ManageOldType, forms.Form): u"(ratio is preserved).</p>") % { 'width': settings.IMAGE_MAX_SIZE[0], 'height': settings.IMAGE_MAX_SIZE[1]}), - required=False, widget=widgets.ImageFileInput()) + max_length=255, required=False, widget=widgets.ImageFileInput()) def __init__(self, *args, **kwargs): operation = None @@ -289,8 +291,6 @@ class RecordFormInterpretation(ManageOldType, forms.Form): datings_comment = forms.CharField( label=_(u"Comments on dating"), required=False, widget=forms.Textarea) - has_furniture = forms.NullBooleanField(label=_(u"Has furniture?"), - required=False) filling = forms.CharField(label=_(u"Filling"), widget=forms.Textarea, required=False) interpretation = forms.CharField(label=_(u"Interpretation"), |