1 files changed, 24 insertions, 24 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 6ba343508..fed48a8ff 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -49,7 +49,7 @@ from ishtar_common import widgets
 
 from ishtar_common.forms import FinalForm, FormSet, get_now, \
     reverse_lazy, get_form_selection, TableSelect, get_data_from_formset, \
-    ManageOldType, CustomForm, FieldType
+    ManageOldType, IshtarForm, CustomForm, FieldType
 from ishtar_common.forms_common import TownFormSet, SourceForm, SourceSelect, \
     get_town_field, TownForm
 
@@ -66,7 +66,7 @@ class ParcelField(forms.MultiValueField):
         return u"-".join(data_list)
 
 
-class ParcelForm(forms.Form):
+class ParcelForm(IshtarForm):
     form_label = _("Parcels")
     base_model = 'parcel'
     associated_models = {'parcel': models.Parcel, 'town': models.Town, }
@@ -202,7 +202,7 @@ class ParcelForm(forms.Form):
         return res
 
 
-class ParcelSelectionForm(forms.Form):
+class ParcelSelectionForm(IshtarForm):
     _town = forms.ChoiceField(label=_("Town"), choices=(), required=False,
                               validators=[valid_id(models.Town)])
     _parcel_selection = forms.CharField(
@@ -367,7 +367,7 @@ class ParcelFormSet(FormSet):
             return self.cleaned_data
 
 
-class RecordRelationsForm(ManageOldType, forms.Form):
+class RecordRelationsForm(ManageOldType):
     base_model = 'right_relation'
     current_model = models.RelationType
     current_related_model = models.Operation
@@ -618,13 +618,13 @@ class OperationSelect(TableSelect):
         return ids
 
 
-class OperationFormSelection(forms.Form):
+class OperationFormSelection(IshtarForm):
     form_label = _(u"Operation search")
     associated_models = {'pk': models.Operation}
     currents = {'pk': models.Operation}
     pk = forms.IntegerField(
         label="", required=False,
-        widget=widgets.JQueryJqGrid(
+        widget=widgets.DataTable(
             reverse_lazy('get-operation'), OperationSelect, models.Operation,
             source_full=reverse_lazy('get-operation-full')),
         validators=[valid_id(models.Operation)])
@@ -662,7 +662,7 @@ class OperationCodeInput(forms.TextInput):
         return mark_safe(rendered + js)
 
 
-class OperationFormFileChoice(forms.Form):
+class OperationFormFileChoice(IshtarForm):
     form_label = _(u"Associated file")
     associated_models = {'associated_file': File, }
     currents = {'associated_file': File}
@@ -673,7 +673,7 @@ class OperationFormFileChoice(forms.Form):
         validators=[valid_id(File)], required=False)
 
 
-class OperationFormAbstract(CustomForm, forms.Form):
+class OperationFormAbstract(CustomForm, IshtarForm):
     form_label = _(u"Abstract")
     form_admin_name = _(u"Operation - 090 - Abstract")
     form_slug = "operation-090-abstract"
@@ -762,7 +762,7 @@ class DashboardForm(forms.Form):
         return fltr
 
 
-class OperationFormGeneral(ManageOldType, CustomForm, forms.Form):
+class OperationFormGeneral(CustomForm, ManageOldType):
     form_label = _(u"General")
     form_admin_name = _(u"Operation - 010 - General")
     form_slug = "operation-010-general"
@@ -1008,7 +1008,7 @@ OperationFormModifGeneral.associated_models = \
 OperationFormModifGeneral.associated_models['associated_file'] = File
 
 
-class CollaboratorForm(CustomForm, forms.Form):
+class CollaboratorForm(CustomForm, IshtarForm):
     form_label = _(u"Collaborators")
     form_admin_name = _(u"Operation - 020 - Collaborators")
     form_slug = "operation-020-collaborators"
@@ -1024,7 +1024,7 @@ class CollaboratorForm(CustomForm, forms.Form):
             self.fields['collaborator'].widget.attrs['full-width'] = True
 
 
-class OperationFormPreventive(CustomForm, forms.Form):
+class OperationFormPreventive(CustomForm, IshtarForm):
     form_label = _(u"Preventive informations - excavation")
     form_admin_name = _(u"Operation - 033 - Preventive - Excavation")
     form_slug = "operation-033-preventive-excavation"
@@ -1043,7 +1043,7 @@ class OperationFormPreventive(CustomForm, forms.Form):
                         validators.MaxValueValidator(100)])
 
 
-class OperationFormPreventiveDiag(CustomForm, forms.Form):
+class OperationFormPreventiveDiag(CustomForm, IshtarForm):
     form_label = _("Preventive informations - diagnostic")
     form_admin_name = _(u"Operation - 037 - Preventive - Diagnostic")
     form_slug = "operation-037-preventive-diagnostic"
@@ -1058,7 +1058,7 @@ class OperationFormPreventiveDiag(CustomForm, forms.Form):
             label=_(u"Prescription on geoarchaeological context"))
 
 
-class SelectedTownForm(forms.Form):
+class SelectedTownForm(IshtarForm):
     form_label = _("Towns")
     associated_models = {'town': Town}
     town = forms.ChoiceField(label=_("Town"), choices=(),
@@ -1085,7 +1085,7 @@ TownFormset.form_admin_name = _(u"Operation - 040 - Towns (2)")
 TownFormset.form_slug = "operation-040-towns-2"
 
 
-class SelectedParcelForm(forms.Form):
+class SelectedParcelForm(IshtarForm):
     form_label = _("Parcels")
     associated_models = {'parcel': models.Parcel}
     parcel = forms.ChoiceField(
@@ -1171,7 +1171,7 @@ class PeriodForm(CustomForm, ManageOldType, forms.Form):
     ]
 
 
-class ArchaeologicalSiteForm(ManageOldType, forms.Form):
+class ArchaeologicalSiteForm(ManageOldType):
     reference = forms.CharField(label=_(u"Reference"), max_length=20)
     name = forms.CharField(label=_(u"Name"), max_length=200, required=False)
     periods = forms.MultipleChoiceField(
@@ -1212,7 +1212,7 @@ class ArchaeologicalSiteForm(ManageOldType, forms.Form):
         return item
 
 
-class ArchaeologicalSiteBasicForm(forms.Form):
+class ArchaeologicalSiteBasicForm(IshtarForm):
     form_label = _("Archaeological site")
     base_model = 'archaeological_site'
     associated_models = {'archaeological_site': models.ArchaeologicalSite}
@@ -1234,7 +1234,7 @@ ArchaeologicalSiteFormSet.form_admin_name = _(
 ArchaeologicalSiteFormSet.form_slug = "operation-030-archaeological-sites"
 
 
-class ArchaeologicalSiteSelectionForm(forms.Form):
+class ArchaeologicalSiteSelectionForm(IshtarForm):
     form_label = _("Associated archaeological sites")
     archaeological_sites = forms.IntegerField(
         widget=widgets.JQueryAutoComplete(
@@ -1386,13 +1386,13 @@ class AdministrativeActOpeSelect(TableSelect):
         return ids
 
 
-class AdministrativeActOpeFormSelection(forms.Form):
+class AdministrativeActOpeFormSelection(IshtarForm):
     form_label = _("Administrative act search")
     associated_models = {'pk': models.AdministrativeAct}
     currents = {'pk': models.AdministrativeAct}
     pk = forms.IntegerField(
         label="", required=False,
-        widget=widgets.JQueryJqGrid(
+        widget=widgets.DataTable(
             reverse_lazy('get-administrativeactop'),
             AdministrativeActOpeSelect, models.AdministrativeAct,
             table_cols='TABLE_COLS_OPE'),
@@ -1406,7 +1406,7 @@ class AdministrativeActOpeFormSelection(forms.Form):
         return cleaned_data
 
 
-class AdministrativeActOpeForm(CustomForm, ManageOldType, forms.Form):
+class AdministrativeActOpeForm(CustomForm, ManageOldType):
     form_label = _("General")
     form_admin_name = _(u"Operation - Administrative act - General")
     form_slug = "operation-adminact-general"
@@ -1482,7 +1482,7 @@ class FinalAdministrativeActDeleteForm(FinalForm):
     confirm_end_msg = _(u"Would you like to delete this administrative act?")
 
 
-class DocumentGenerationAdminActForm(forms.Form):
+class DocumentGenerationAdminActForm(IshtarForm):
     _associated_model = models.AdministrativeAct
     document_template = forms.ChoiceField(label=_("Template"), choices=[])
 
@@ -1529,7 +1529,7 @@ class DocumentGenerationAdminActForm(forms.Form):
         return template.publish(c_object)
 
 
-class GenerateDocForm(forms.Form):
+class GenerateDocForm(IshtarForm):
     form_label = _("Doc generation")
     doc_generation = forms.ChoiceField(
         required=False, choices=[], label=_(u"Generate the associated doc?"))
@@ -1552,13 +1552,13 @@ class AdministrativeActRegisterSelect(AdministrativeActOpeSelect):
         self.fields['act_type'].help_text = models.ActType.get_help()
 
 
-class AdministrativeActRegisterFormSelection(forms.Form):
+class AdministrativeActRegisterFormSelection(IshtarForm):
     form_label = pgettext_lazy('admin act register', u"Register")
     associated_models = {'pk': models.AdministrativeAct}
     currents = {'pk': models.AdministrativeAct}
     pk = forms.IntegerField(
         label="", required=False,
-        widget=widgets.JQueryJqGrid(
+        widget=widgets.DataTable(
             reverse_lazy('get-administrativeact'),
             AdministrativeActRegisterSelect, models.AdministrativeAct,
             table_cols='TABLE_COLS',