diff options
Diffstat (limited to 'ishtar_common/forms_common.py')
| -rw-r--r-- | ishtar_common/forms_common.py | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index dadeefee0..403f9fe5f 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -33,6 +33,7 @@ from django.utils.translation import ugettext_lazy as _ import models import widgets +from bootstrap_datepicker.widgets import DatePicker from ishtar_common.templatetags.link_to_window import link_to_window from forms import FinalForm, FormSet, reverse_lazy, name_validator, \ TableSelect, ManageOldType, CustomForm, FieldType @@ -295,6 +296,7 @@ class OrganizationForm(ManageOldType, NewItemForm): class OrganizationSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) name = forms.CharField(label=_(u"Name"), max_length=300) organization_type = forms.ChoiceField(label=_(u"Type"), choices=[]) @@ -305,12 +307,13 @@ class OrganizationSelect(TableSelect): class OrganizationFormSelection(forms.Form): + SEARCH_AND_SELECT = True form_label = _(u"Organization search") associated_models = {'pk': models.Organization} currents = {'pk': models.Organization} pk = forms.IntegerField( label="", - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-organization'), OrganizationSelect, models.Organization, source_full=reverse_lazy('get-organization-full')), @@ -386,7 +389,7 @@ class OrgaMergeFormSelection(ManualMerge, forms.Form): currents = {'to_merge': models.Organization} to_merge = forms.CharField( label="", required=False, - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-organization'), OrganizationSelect, models.Organization, multiple_select=True, @@ -407,6 +410,7 @@ class BaseOrganizationForm(forms.ModelForm): class PersonSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) name = forms.CharField(label=_(u"Name"), max_length=200) surname = forms.CharField(label=_(u"Surname"), max_length=50) email = forms.CharField(label=_(u"Email"), max_length=75) @@ -424,24 +428,26 @@ class PersonSelect(TableSelect): class PersonFormSelection(forms.Form): + SEARCH_AND_SELECT = True form_label = _(u"Person search") associated_models = {'pk': models.Person} currents = {'pk': models.Person} pk = forms.IntegerField( label="", - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-person'), PersonSelect, models.Person, source_full=reverse_lazy('get-person-full')), validators=[models.valid_id(models.Person)]) class PersonMergeFormSelection(ManualMerge, forms.Form): + SEARCH_AND_SELECT = True form_label = _("Person to merge") associated_models = {'to_merge': models.Person} currents = {'to_merge': models.Person} to_merge = forms.CharField( label="", required=False, - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-person'), PersonSelect, models.Person, multiple_select=True, @@ -519,17 +525,19 @@ class PersonUserSelect(PersonSelect): class PersonUserFormSelection(PersonFormSelection): + SEARCH_AND_SELECT = True form_label = _(u"Person search") associated_models = {'pk': models.Person} currents = {'pk': models.Person} pk = forms.IntegerField( label="", - widget=widgets.JQueryJqGrid(reverse_lazy('get-person'), - PersonUserSelect, models.Person), + widget=widgets.DataTable(reverse_lazy('get-person'), + PersonUserSelect, models.Person), validators=[models.valid_id(models.Person)]) class IshtarUserSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) username = forms.CharField(label=_(u"Username"), max_length=200) name = forms.CharField(label=_(u"Name"), max_length=200) surname = forms.CharField(label=_(u"Surname"), max_length=50) @@ -548,13 +556,14 @@ class IshtarUserSelect(TableSelect): class AccountFormSelection(forms.Form): + SEARCH_AND_SELECT = True form_label = _(u"Account search") associated_models = {'pk': models.IshtarUser} currents = {'pk': models.IshtarUser} pk = forms.IntegerField( label="", - widget=widgets.JQueryJqGrid(reverse_lazy('get-ishtaruser'), - IshtarUserSelect, models.IshtarUser), + widget=widgets.DataTable(reverse_lazy('get-ishtaruser'), + IshtarUserSelect, models.IshtarUser), validators=[models.valid_id(models.IshtarUser)]) @@ -863,7 +872,7 @@ class MergeOrganizationForm(MergeForm): ###################### # Sources management # ###################### -class SourceForm(CustomForm, ManageOldType, forms.Form): +class SourceForm(CustomForm, ManageOldType): form_label = _(u"Documentation informations") form_admin_name = _("Source - General") form_slug = "source-general" @@ -882,12 +891,12 @@ class SourceForm(CustomForm, ManageOldType, forms.Form): associated_url = forms.URLField( required=False, label=_(u"Numerical ressource (web address)")) receipt_date = forms.DateField(label=_(u"Receipt date"), required=False, - widget=widgets.JQueryDate) + widget=DatePicker) creation_date = forms.DateField(label=_(u"Creation date"), required=False, - widget=widgets.JQueryDate) + widget=DatePicker) receipt_date_in_documentation = forms.DateField( label=_(u"Receipt date in documentation"), required=False, - widget=widgets.JQueryDate) + widget=DatePicker) comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea, required=False) description = forms.CharField(label=_(u"Description"), |