diff options
Diffstat (limited to 'archaeological_warehouse/forms.py')
| -rw-r--r-- | archaeological_warehouse/forms.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index 4d4348b70..5ac907deb 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -29,6 +29,7 @@ from ishtar_common.models import Person, valid_id from archaeological_finds.models import TreatmentType, FindBasket import models from ishtar_common import widgets +from bootstrap_datepicker.widgets import DatePicker from ishtar_common.forms import name_validator, reverse_lazy, \ get_form_selection, TableSelect, ManageOldType, FinalForm, FormSet, \ CustomForm, FieldType @@ -77,6 +78,7 @@ SelectedDivisionFormset.form_slug = "warehouse-020-divisions" class WarehouseSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) name = forms.CharField(label=_(u"Name")) warehouse_type = forms.ChoiceField(label=_(u"Warehouse type"), choices=[]) towns = forms.CharField(label=_(u"Town")) @@ -90,12 +92,13 @@ class WarehouseSelect(TableSelect): class WarehouseFormSelection(forms.Form): + SEARCH_AND_SELECT = True form_label = _("Warehouse search") associated_models = {'pk': models.Warehouse} currents = {'pk': models.Warehouse} pk = forms.IntegerField( label="", required=False, - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-warehouse'), WarehouseSelect, models.Warehouse), validators=[valid_id(models.Warehouse)]) @@ -244,6 +247,7 @@ class ContainerModifyForm(ContainerForm): class ContainerSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) location = get_warehouse_field() container_type = forms.ChoiceField(label=_(u"Container type"), choices=[]) reference = forms.CharField(label=_(u"Ref.")) @@ -255,6 +259,7 @@ class ContainerSelect(TableSelect): self.fields['container_type'].help_text = \ models.ContainerType.get_help() + ContainerFormSelection = get_form_selection( 'ContainerFormSelection', _(u"Container search"), 'container', models.Container, ContainerSelect, 'get-container', @@ -281,7 +286,7 @@ class BasePackagingForm(SelectFindBasketForm): associated_model=Person, new=True), validators=[valid_id(Person)]) start_date = forms.DateField( - label=_(u"Date"), required=False, widget=widgets.JQueryDate) + label=_(u"Date"), required=False, widget=DatePicker) class FindPackagingFormSelection(FindMultipleFormSelection): |