UI: adapt forms

1 files changed, 23 insertions, 23 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 841131da6..ab4162936 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
+    ManageOldType, IshtarForm
 from ishtar_common.forms_common import TownFormSet, SourceForm, SourceSelect, \
     get_town_field
 
@@ -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(
@@ -371,7 +371,7 @@ ParcelFormSet = formset_factory(ParcelForm, can_delete=True,
 ParcelFormSet.form_label = _(u"Parcels")
 
 
-class RecordRelationsForm(ManageOldType, forms.Form):
+class RecordRelationsForm(ManageOldType, IshtarForm):
     base_model = 'right_relation'
     current_model = models.RelationType
     current_related_model = models.Operation
@@ -620,7 +620,7 @@ 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}
@@ -664,7 +664,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}
@@ -675,7 +675,7 @@ class OperationFormFileChoice(forms.Form):
         validators=[valid_id(File)], required=False)
 
 
-class OperationFormAbstract(forms.Form):
+class OperationFormAbstract(IshtarForm):
     form_label = _(u"Abstract")
     abstract = forms.CharField(
         label=_(u"Abstract"),
@@ -761,7 +761,7 @@ class DashboardForm(forms.Form):
         return fltr
 
 
-class OperationFormGeneral(ManageOldType, forms.Form):
+class OperationFormGeneral(ManageOldType, IshtarForm):
     form_label = _(u"General")
     file_upload = True
     associated_models = {'scientist': Person,
@@ -995,7 +995,7 @@ OperationFormModifGeneral.associated_models = \
 OperationFormModifGeneral.associated_models['associated_file'] = File
 
 
-class CollaboratorForm(forms.Form):
+class CollaboratorForm(IshtarForm):
     form_label = _(u"Collaborators")
     base_models = ['collaborator']
     associated_models = {'collaborator': Person, }
@@ -1007,7 +1007,7 @@ class CollaboratorForm(forms.Form):
         self.fields['collaborator'].widget.attrs['full-width'] = True
 
 
-class OperationFormPreventive(forms.Form):
+class OperationFormPreventive(IshtarForm):
     form_label = _(u"Preventive informations - excavation")
     cost = forms.IntegerField(label=_(u"Cost (euros)"), required=False)
     scheduled_man_days = forms.IntegerField(label=_(u"Scheduled man-days"),
@@ -1023,7 +1023,7 @@ class OperationFormPreventive(forms.Form):
                         validators.MaxValueValidator(100)])
 
 
-class OperationFormPreventiveDiag(forms.Form):
+class OperationFormPreventiveDiag(IshtarForm):
     form_label = _("Preventive informations - diagnostic")
     if settings.COUNTRY == 'fr':
         zoning_prescription = forms.NullBooleanField(
@@ -1035,7 +1035,7 @@ class OperationFormPreventiveDiag(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=(),
@@ -1054,7 +1054,7 @@ SelectedTownFormset = formset_factory(SelectedTownForm, can_delete=True,
 SelectedTownFormset.form_label = _(u"Towns")
 
 
-class SelectedParcelForm(forms.Form):
+class SelectedParcelForm(IshtarForm):
     form_label = _("Parcels")
     associated_models = {'parcel': models.Parcel}
     parcel = forms.ChoiceField(
@@ -1102,7 +1102,7 @@ class SelectedParcelFormSet(forms.Form):
 """
 
 
-class RemainForm(ManageOldType, forms.Form):
+class RemainForm(ManageOldType, IshtarForm):
     form_label = _("Remain types")
     base_model = 'remain'
     associated_models = {'remain': models.RemainType}
@@ -1118,7 +1118,7 @@ class RemainForm(ManageOldType, forms.Form):
         self.fields['remain'].help_text = models.RemainType.get_help()
 
 
-class PeriodForm(ManageOldType, forms.Form):
+class PeriodForm(ManageOldType, IshtarForm):
     form_label = _("Periods")
     base_model = 'period'
     associated_models = {'period': models.Period}
@@ -1134,7 +1134,7 @@ class PeriodForm(ManageOldType, forms.Form):
         self.fields['period'].help_text = models.Period.get_help()
 
 
-class ArchaeologicalSiteForm(ManageOldType, forms.Form):
+class ArchaeologicalSiteForm(ManageOldType, IshtarForm):
     reference = forms.CharField(label=_(u"Reference"), max_length=20)
     name = forms.CharField(label=_(u"Name"), max_length=200, required=False)
     periods = forms.MultipleChoiceField(
@@ -1180,7 +1180,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}
@@ -1199,7 +1199,7 @@ ArchaeologicalSiteFormSet = formset_factory(ArchaeologicalSiteBasicForm,
 ArchaeologicalSiteFormSet.form_label = _("Archaeological sites")
 
 
-class ArchaeologicalSiteSelectionForm(forms.Form):
+class ArchaeologicalSiteSelectionForm(IshtarForm):
     form_label = _("Associated archaeological sites")
     archaeological_sites = forms.IntegerField(
         widget=widgets.JQueryAutoComplete(
@@ -1351,7 +1351,7 @@ 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}
@@ -1371,7 +1371,7 @@ class AdministrativeActOpeFormSelection(forms.Form):
         return cleaned_data
 
 
-class AdministrativeActOpeForm(ManageOldType, forms.Form):
+class AdministrativeActOpeForm(ManageOldType, IshtarForm):
     form_label = _("General")
     associated_models = {'act_type': models.ActType, }
     #                     'signatory':Person}
@@ -1447,7 +1447,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=[])
 
@@ -1494,7 +1494,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?"))
@@ -1517,7 +1517,7 @@ 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}