summaryrefslogtreecommitdiff
path: root/archaeological_operations/forms.py
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_operations/forms.py')
-rw-r--r--archaeological_operations/forms.py46
1 files changed, 23 insertions, 23 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 6966fff50..c61b75f7c 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
@@ -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):
base_model = 'right_relation'
current_model = models.RelationType
current_related_model = models.Operation
@@ -622,7 +622,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}
@@ -666,7 +666,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}
@@ -677,7 +677,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 = _("Operations - Abstract")
form_slug = "operation-abstract"
@@ -766,7 +766,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 - General")
form_slug = "operation-general"
@@ -1012,7 +1012,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 - Collaborators")
form_slug = "operation-collaborators"
@@ -1028,7 +1028,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 - Preventive - Excavation")
form_slug = "operation-preventive-excavation"
@@ -1047,7 +1047,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 - Preventive - Diagnostic")
form_slug = "operation-preventive-diagnostic"
@@ -1062,7 +1062,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=(),
@@ -1083,7 +1083,7 @@ SelectedTownFormset.form_label = _(u"Towns")
SelectedTownFormset.form_slug = "towns"
-class SelectedParcelForm(forms.Form):
+class SelectedParcelForm(IshtarForm):
form_label = _("Parcels")
associated_models = {'parcel': models.Parcel}
parcel = forms.ChoiceField(
@@ -1135,7 +1135,7 @@ class SelectedParcelFormSet(forms.Form):
"""
-class RemainForm(CustomForm, ManageOldType, forms.Form):
+class RemainForm(CustomForm, ManageOldType):
form_label = _("Remain types")
form_admin_name = _("Operations - Remains")
form_slug = "operation-remains"
@@ -1151,7 +1151,7 @@ class RemainForm(CustomForm, ManageOldType, forms.Form):
]
-class PeriodForm(CustomForm, ManageOldType, forms.Form):
+class PeriodForm(CustomForm, ManageOldType):
form_label = _("Periods")
form_admin_name = _("Operations - Periods")
form_slug = "operation-periods"
@@ -1167,7 +1167,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(
@@ -1208,7 +1208,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}
@@ -1230,7 +1230,7 @@ ArchaeologicalSiteFormSet.form_admin_name = _("Operation - Archaeological "
ArchaeologicalSiteFormSet.form_slug = "operation-archaeological-sites"
-class ArchaeologicalSiteSelectionForm(forms.Form):
+class ArchaeologicalSiteSelectionForm(IshtarForm):
form_label = _("Associated archaeological sites")
archaeological_sites = forms.IntegerField(
widget=widgets.JQueryAutoComplete(
@@ -1385,7 +1385,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}
@@ -1405,7 +1405,7 @@ class AdministrativeActOpeFormSelection(forms.Form):
return cleaned_data
-class AdministrativeActOpeForm(CustomForm, ManageOldType, forms.Form):
+class AdministrativeActOpeForm(CustomForm, ManageOldType):
form_label = _("General")
form_admin_name = _("Operations - Administrative act - General")
form_slug = "operation-adminact-general"
@@ -1481,7 +1481,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=[])
@@ -1528,7 +1528,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?"))
@@ -1551,7 +1551,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}