diff options
| -rw-r--r-- | ishtar/ishtar_base/forms_operations.py | 7 | ||||
| -rw-r--r-- | ishtar/ishtar_base/views.py | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ishtar/ishtar_base/forms_operations.py b/ishtar/ishtar_base/forms_operations.py index 984d29d68..fbdeb3163 100644 --- a/ishtar/ishtar_base/forms_operations.py +++ b/ishtar/ishtar_base/forms_operations.py @@ -184,10 +184,11 @@ class OperationWizard(Wizard): return datas class OperationSelect(forms.Form): + common_name = forms.CharField(label=_(u"Name"), max_length=30) towns = get_town_field() - operation_type = forms.ChoiceField(label=_("Operation type"), + operation_type = forms.ChoiceField(label=_(u"Operation type"), choices=[]) - remains = forms.ChoiceField(label=_("Remains"), + remains = forms.ChoiceField(label=_(u"Remains"), choices=models.RemainType.get_types()) year = forms.IntegerField(label=_("Year")) end_date = forms.NullBooleanField(label=_(u"Is open?")) @@ -276,7 +277,7 @@ class OperationFormReference(forms.Form): hidden_year = forms.IntegerField(widget=forms.HiddenInput) operation_code = forms.IntegerField(label=_(u"Operation code")) common_name = forms.CharField(label=_(u"Generic name"), required=False, - max_length=120) + max_length=120, widget=forms.Textarea) operator_reference = forms.CharField(label=_(u"Operator reference"), required=False, max_length=20) if settings.COUNTRY == 'fr': diff --git a/ishtar/ishtar_base/views.py b/ishtar/ishtar_base/views.py index ba69086c0..876b043b6 100644 --- a/ishtar/ishtar_base/views.py +++ b/ishtar/ishtar_base/views.py @@ -464,7 +464,8 @@ def autocomplete_operation(request, non_closed=True): get_operation = get_item(models.Operation, 'get_operation', 'operation', bool_fields = ['end_date__isnull'], - extra_request_keys={'end_date':'end_date__isnull', + extra_request_keys={'common_name':'common_name__icontains', + 'end_date':'end_date__isnull', 'year_index':('year', 'operation_code')}) show_operation = show_item(models.Operation, 'operation') revert_operation = revert_item(models.Operation) |