diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-26 20:52:11 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-26 20:52:11 +0100 |
commit | f72f7d90893b4f4ae0e000563b7c20faeefc8f18 (patch) | |
tree | 8c8f06c9fb974edde62e82875f7a1b8aad49d7c3 /archaeological_finds/forms.py | |
parent | 90b20a15bd6bf4f7808957bb8820f10f0d66d5e8 (diff) | |
parent | 0cd8904defe334ad5307e6ab3ce13638479815a8 (diff) | |
download | Ishtar-f72f7d90893b4f4ae0e000563b7c20faeefc8f18.tar.bz2 Ishtar-f72f7d90893b4f4ae0e000563b7c20faeefc8f18.zip |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_finds/forms.py')
-rw-r--r-- | archaeological_finds/forms.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 1498d4028..83a9e2da3 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -51,7 +51,7 @@ class FindForm(forms.Form): 'preservation_to_consider': models.PreservationType, 'integritie': models.IntegrityType} label = forms.CharField( - label=_(u"Free-ID"), + label=_(u"Free ID"), validators=[validators.MaxLengthValidator(60)]) previous_id = forms.CharField(label=_("Previous ID"), required=False) description = forms.CharField(label=_("Description"), @@ -148,6 +148,9 @@ DatingFormSet.form_label = _("Dating") class FindSelect(TableSelect): + base_finds__cache_short_id = forms.CharField(label=_(u"Short ID")) + base_finds__cache_complete_id = forms.CharField(label=_(u"Complete ID")) + label = forms.CharField(label=_(u"Free ID")) base_finds__context_record__parcel__town = get_town_field() base_finds__context_record__operation__year = forms.IntegerField( label=_(u"Year")) @@ -292,7 +295,7 @@ class ResultFindForm(forms.Form): form_label = _(u"Resulting find") associated_models = {'material_type': models.MaterialType} label = forms.CharField( - label=_(u"Free-ID"), + label=_(u"Free ID"), validators=[validators.MaxLengthValidator(60)]) description = forms.CharField(label=_(u"Precise description"), widget=forms.Textarea) |