diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 01:18:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 01:18:28 +0100 |
| commit | a95e41815be353f717e5a9347166e0bbc486c687 (patch) | |
| tree | a4aec468c53ba6d5baa688df0dba3fbb8a588fb4 /archaeological_context_records/forms.py | |
| parent | 99f0621b864550817931a46850e5194f571c9d81 (diff) | |
| parent | 7475ae571619c3726e63c5cefc0215930cb83278 (diff) | |
| download | Ishtar-a95e41815be353f717e5a9347166e0bbc486c687.tar.bz2 Ishtar-a95e41815be353f717e5a9347166e0bbc486c687.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'archaeological_context_records/forms.py')
| -rw-r--r-- | archaeological_context_records/forms.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 72cb24097..0452243e2 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -66,13 +66,13 @@ class RecordSelect(TableSelect): operation__operation_code = forms.IntegerField( label=_(u"Operation's number (index by year)")) archaeological_sites = forms.IntegerField( - label=_("Archaelogical site"), + label=_("Archaeological site"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-archaeologicalsite'), associated_model=ArchaeologicalSite), validators=[valid_id(ArchaeologicalSite)]) ope_relation_types = forms.MultipleChoiceField( - label=_(u"Search within operation relations"), choices=[], + label=_(u"Search within related operations"), choices=[], widget=forms.CheckboxSelectMultiple) datings__period = forms.ChoiceField(label=_(u"Period"), choices=[]) unit = forms.ChoiceField(label=_(u"Unit type"), choices=[]) @@ -159,6 +159,7 @@ class RecordFormGeneral(ManageOldType, forms.Form): max_length=255, required=False, widget=widgets.ImageFileInput()) def __init__(self, *args, **kwargs): + # TODO: simplify operation = None if 'data' in kwargs and kwargs['data'] and \ ('operation' in kwargs['data'] or |