diff options
Diffstat (limited to 'ishtar/furnitures/forms_context_records.py')
| -rw-r--r-- | ishtar/furnitures/forms_context_records.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/ishtar/furnitures/forms_context_records.py b/ishtar/furnitures/forms_context_records.py index d28bd998c..3af7d3f71 100644 --- a/ishtar/furnitures/forms_context_records.py +++ b/ishtar/furnitures/forms_context_records.py @@ -35,6 +35,7 @@ import models import widgets from forms import Wizard, FinalForm, FormSet, SearchWizard, DeletionWizard, \ formset_factory, get_now, reverse_lazy +from forms_common import get_town_field from forms_operations import OperationFormSelection class RecordWizard(Wizard): @@ -81,10 +82,7 @@ class RecordModifWizard(RecordWizard): model = models.ContextRecord class RecordSelect(forms.Form): - parcel__town = forms.IntegerField(label=_(u"Town"), - widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \ - 'autocomplete-town', associated_model=models.Town), - validators=[models.valid_id(models.Town)]) + parcel__town = get_town_field() parcel__operation__year = forms.IntegerField(label=_("Year")) datings__period = forms.ChoiceField(label=_("Period"), choices=models.Period.get_types()) @@ -164,7 +162,13 @@ class DatingForm(forms.Form): quality = forms.ChoiceField(label=_("Quality"), required=False, choices=models.DatingQuality.get_types()) dating_type = forms.ChoiceField(label=_("Dating type"), required=False, - choices=models.DatingType.get_types()) + choices=[]) + + def __init__(self, *args, **kwargs): + super(DatingForm, self).__init__(*args, **kwargs) + self.fields['dating_type'].choices = models.DatingType.get_types() + self.fields['dating_type'].help_text = models.DatingType.get_help() + DatingFormSet = formset_factory(DatingForm, can_delete=True, formset=FormSet) @@ -180,7 +184,7 @@ class RecordFormInterpretation(forms.Form): widget=forms.Textarea, required=False) interpretation = forms.CharField(label=_(u"Interpretation"), widget=forms.Textarea, required=False) - activity = forms.ChoiceField(label=_("Activity"), required=False, + activity = forms.ChoiceField(label=_(u"Activity"), required=False, choices=[]) identification = forms.ChoiceField(label=_("Identification"), required=False, choices=[]) @@ -194,8 +198,11 @@ class RecordFormInterpretation(forms.Form): def __init__(self, *args, **kwargs): super(RecordFormInterpretation, self).__init__(*args, **kwargs) self.fields['activity'].choices = models.ActivityType.get_types() + self.fields['activity'].help_text = models.ActivityType.get_help() self.fields['identification'].choices = \ models.IdentificationType.get_types() + self.fields['identification'].help_text = \ + models.IdentificationType.get_help() record_search_wizard = SearchWizard([ ('general-record_search', RecordFormSelection)], |