diff options
Diffstat (limited to 'ishtar/furnitures/forms_items.py')
| -rw-r--r-- | ishtar/furnitures/forms_items.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ishtar/furnitures/forms_items.py b/ishtar/furnitures/forms_items.py index d4cec0ce9..b3f360db3 100644 --- a/ishtar/furnitures/forms_items.py +++ b/ishtar/furnitures/forms_items.py @@ -34,6 +34,7 @@ import models import widgets from forms import Wizard, FinalForm, FormSet, SearchWizard, \ formset_factory, get_now, reverse_lazy +from forms_common import get_town_field from forms_context_records import RecordFormSelection class ItemWizard(Wizard): @@ -77,7 +78,12 @@ class DateForm(forms.Form): dating__quality = forms.ChoiceField(label=_("Quality"), required=False, choices=models.DatingQuality.get_types()) dating__dating_type = forms.ChoiceField(label=_("Dating type"), - required=False, choices=models.DatingType.get_types()) + required=False, choices=[]) + + def __init__(self, *args, **kwargs): + super(DateForm, self).__init__(*args, **kwargs) + self.fields['dating__dating_type'].choices = models.DatingType.get_types() + self.fields['dating__dating_type'].help_text = models.DatingType.get_help() item_creation_wizard = ItemWizard([ ('selecrecord-item_creation', RecordFormSelection), @@ -87,10 +93,7 @@ item_creation_wizard = ItemWizard([ url_name='item_creation',) class ItemSelect(forms.Form): - base_items__context_record__parcel__town = forms.IntegerField( - widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \ - 'autocomplete-town', associated_model=models.Town), - validators=[models.valid_id(models.Town)], label=_(u"Town")) + base_items__context_record__parcel__town = get_town_field() base_items__context_record__parcel__operation__year = forms.IntegerField( label=_("Year")) dating__period = forms.ChoiceField( @@ -100,7 +103,7 @@ class ItemSelect(forms.Form): base_items__is_isolated = forms.NullBooleanField(label=_("Is isolated?")) class ItemFormSelection(forms.Form): - form_label = _("Item") + form_label = _("Item search") associated_models = {'pk':models.Item} currents = {'pk':models.Item} pk = forms.IntegerField(label="", required=False, |