Merge branch 'develop' into develop-bootstrap

3 files changed, 46 insertions, 46 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 861e18905..fed48a8ff 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -51,7 +51,7 @@ from ishtar_common.forms import FinalForm, FormSet, get_now, \
     reverse_lazy, get_form_selection, TableSelect, get_data_from_formset, \
     ManageOldType, IshtarForm, CustomForm, FieldType
 from ishtar_common.forms_common import TownFormSet, SourceForm, SourceSelect, \
-    get_town_field
+    get_town_field, TownForm
 
 from archaeological_operations.utils import parse_parcels
 
@@ -366,10 +366,6 @@ class ParcelFormSet(FormSet):
         if hasattr(self, 'cleaned_data') and self.cleaned_data:
             return self.cleaned_data
 
-ParcelFormSet = formset_factory(ParcelForm, can_delete=True,
-                                formset=ParcelFormSet)
-ParcelFormSet.form_label = _(u"Parcels")
-
 
 class RecordRelationsForm(ManageOldType):
     base_model = 'right_relation'
@@ -477,8 +473,8 @@ class RecordRelationsFormSetBase(FormSet):
 RecordRelationsFormSet = formset_factory(
     RecordRelationsForm, can_delete=True, formset=RecordRelationsFormSetBase)
 RecordRelationsFormSet.form_label = _(u"Relations")
-RecordRelationsFormSet.form_admin_name = _("Operations - Relations")
-RecordRelationsFormSet.form_slug = "operation-relations"
+RecordRelationsFormSet.form_admin_name = _(u"Operation - 080 - Relations")
+RecordRelationsFormSet.form_slug = "operation-080-relations"
 
 
 class OperationSelect(TableSelect):
@@ -679,8 +675,8 @@ class OperationFormFileChoice(IshtarForm):
 
 class OperationFormAbstract(CustomForm, IshtarForm):
     form_label = _(u"Abstract")
-    form_admin_name = _("Operations - Abstract")
-    form_slug = "operation-abstract"
+    form_admin_name = _(u"Operation - 090 - Abstract")
+    form_slug = "operation-090-abstract"
     abstract = forms.CharField(
         label=_(u"Abstract"),
         widget=forms.Textarea(attrs={'class': 'xlarge'}), required=False)
@@ -768,8 +764,8 @@ class DashboardForm(forms.Form):
 
 class OperationFormGeneral(CustomForm, ManageOldType):
     form_label = _(u"General")
-    form_admin_name = _(u"Operation - General")
-    form_slug = "operation-general"
+    form_admin_name = _(u"Operation - 010 - General")
+    form_slug = "operation-010-general"
 
     file_upload = True
     associated_models = {'scientist': Person,
@@ -1014,8 +1010,8 @@ OperationFormModifGeneral.associated_models['associated_file'] = File
 
 class CollaboratorForm(CustomForm, IshtarForm):
     form_label = _(u"Collaborators")
-    form_admin_name = _(u"Operation - Collaborators")
-    form_slug = "operation-collaborators"
+    form_admin_name = _(u"Operation - 020 - Collaborators")
+    form_slug = "operation-020-collaborators"
 
     base_models = ['collaborator']
     associated_models = {'collaborator': Person, }
@@ -1030,8 +1026,8 @@ class CollaboratorForm(CustomForm, IshtarForm):
 
 class OperationFormPreventive(CustomForm, IshtarForm):
     form_label = _(u"Preventive informations - excavation")
-    form_admin_name = _(u"Operation - Preventive - Excavation")
-    form_slug = "operation-preventive-excavation"
+    form_admin_name = _(u"Operation - 033 - Preventive - Excavation")
+    form_slug = "operation-033-preventive-excavation"
 
     cost = forms.IntegerField(label=_(u"Cost (euros)"), required=False)
     scheduled_man_days = forms.IntegerField(label=_(u"Scheduled man-days"),
@@ -1049,8 +1045,8 @@ class OperationFormPreventive(CustomForm, IshtarForm):
 
 class OperationFormPreventiveDiag(CustomForm, IshtarForm):
     form_label = _("Preventive informations - diagnostic")
-    form_admin_name = _(u"Operation - Preventive - Diagnostic")
-    form_slug = "operation-preventive-diagnostic"
+    form_admin_name = _(u"Operation - 037 - Preventive - Diagnostic")
+    form_slug = "operation-037-preventive-diagnostic"
 
     if settings.COUNTRY == 'fr':
         zoning_prescription = forms.NullBooleanField(
@@ -1080,7 +1076,13 @@ class SelectedTownForm(IshtarForm):
 SelectedTownFormset = formset_factory(SelectedTownForm, can_delete=True,
                                       formset=TownFormSet)
 SelectedTownFormset.form_label = _(u"Towns")
-SelectedTownFormset.form_slug = "towns"
+SelectedTownFormset.form_admin_name = _(u"Operation - 040 - Towns")
+SelectedTownFormset.form_slug = "operation-040-towns"
+
+TownFormset = formset_factory(TownForm, can_delete=True, formset=TownFormSet)
+TownFormset.form_label = _("Towns")
+TownFormset.form_admin_name = _(u"Operation - 040 - Towns (2)")
+TownFormset.form_slug = "operation-040-towns-2"
 
 
 class SelectedParcelForm(IshtarForm):
@@ -1101,13 +1103,15 @@ class SelectedParcelForm(IshtarForm):
 SelectedParcelFormSet = formset_factory(SelectedParcelForm, can_delete=True,
                                         formset=ParcelFormSet)
 SelectedParcelFormSet.form_label = _("Parcels")
-SelectedParcelFormSet.form_admin_name = _(u"Operations - Parcels")
-SelectedParcelFormSet.form_slug = "operation-parcels"
+SelectedParcelFormSet.form_admin_name = _(u"Operation - 050 - Parcels")
+SelectedParcelFormSet.form_slug = "operation-050-parcels"
 
 SelectedParcelGeneralFormSet = formset_factory(ParcelForm, can_delete=True,
                                                formset=ParcelFormSet)
-SelectedParcelGeneralFormSet.form_admin_name = _("Parcels")
-SelectedParcelGeneralFormSet.form_slug = "operation-parcels"
+SelectedParcelGeneralFormSet.form_label = _("Parcels")
+SelectedParcelGeneralFormSet.form_admin_name = _(
+    u"Operation - 050 - Parcels (2)")
+SelectedParcelGeneralFormSet.form_slug = "operation-050-parcels-2"
 
 """
 class SelectedParcelFormSet(forms.Form):
@@ -1135,10 +1139,10 @@ class SelectedParcelFormSet(forms.Form):
 """
 
 
-class RemainForm(CustomForm, ManageOldType):
-    form_label = _("Remain types")
-    form_admin_name = _("Operations - Remains")
-    form_slug = "operation-remains"
+class RemainForm(CustomForm, ManageOldType, forms.Form):
+    form_label = _(u"Remain types")
+    form_admin_name = _(u"Operation - 060 - Remains")
+    form_slug = "operation-060-remains"
 
     base_model = 'remain'
     associated_models = {'remain': models.RemainType}
@@ -1151,10 +1155,10 @@ class RemainForm(CustomForm, ManageOldType):
     ]
 
 
-class PeriodForm(CustomForm, ManageOldType):
-    form_label = _("Periods")
-    form_admin_name = _("Operations - Periods")
-    form_slug = "operation-periods"
+class PeriodForm(CustomForm, ManageOldType, forms.Form):
+    form_label = _(u"Periods")
+    form_admin_name = _(u"Operation - 070 - Periods")
+    form_slug = "operation-070-periods"
 
     base_model = 'period'
     associated_models = {'period': models.Period}
@@ -1222,12 +1226,12 @@ class ArchaeologicalSiteBasicForm(IshtarForm):
         required=False)
 
 
-ArchaeologicalSiteFormSet = formset_factory(ArchaeologicalSiteBasicForm,
-                                            can_delete=True, formset=FormSet)
-ArchaeologicalSiteFormSet.form_label = _("Archaeological sites")
-ArchaeologicalSiteFormSet.form_admin_name = _("Operation - Archaeological "
-                                              "sites")
-ArchaeologicalSiteFormSet.form_slug = "operation-archaeological-sites"
+ArchaeologicalSiteFormSet = formset_factory(
+    ArchaeologicalSiteBasicForm, can_delete=True, formset=FormSet)
+ArchaeologicalSiteFormSet.form_label = _(u"Archaeological sites")
+ArchaeologicalSiteFormSet.form_admin_name = _(
+    u"Operation - 030 - Archaeological sites")
+ArchaeologicalSiteFormSet.form_slug = "operation-030-archaeological-sites"
 
 
 class ArchaeologicalSiteSelectionForm(IshtarForm):
@@ -1255,9 +1259,6 @@ class OperationDeletionForm(FinalForm):
 
 
 class OperationSourceForm(SourceForm):
-    form_admin_name = _("Operation Sources - Main")
-    form_slug = "operation-source-relations"
-
     pk = forms.IntegerField(required=False, widget=forms.HiddenInput)
     index = forms.IntegerField(label=_(u"Index"))
     hidden_operation_id = forms.IntegerField(label="",
@@ -1407,7 +1408,7 @@ class AdministrativeActOpeFormSelection(IshtarForm):
 
 class AdministrativeActOpeForm(CustomForm, ManageOldType):
     form_label = _("General")
-    form_admin_name = _("Operations - Administrative act - General")
+    form_admin_name = _(u"Operation - Administrative act - General")
     form_slug = "operation-adminact-general"
 
     associated_models = {'act_type': models.ActType, }
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index af6199774..21b7da2a0 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -1178,7 +1178,7 @@ class CustomFormTest(TestCase, OperationInitTest):
             key_in_charge, response.content,
             msg="filter all - 'in charge' field not found on the modification "
                 "wizard")
-        f = CustomForm.objects.create(name="Test", form="operation-general",
+        f = CustomForm.objects.create(name="Test", form="operation-010-general",
                                       available=True, apply_to_all=True)
         ExcludedField.objects.create(custom_form=f, field="in_charge")
 
@@ -1190,7 +1190,7 @@ class CustomFormTest(TestCase, OperationInitTest):
 
         # user type form prevail on "all"
         f_scientist = CustomForm.objects.create(
-            name="Test", form="operation-general", available=True)
+            name="Test", form="operation-010-general", available=True)
         tpe = PersonType.objects.get(txt_idx='head_scientist')
         key_address = "address"
         f_scientist.user_types.add(tpe)
@@ -1208,7 +1208,7 @@ class CustomFormTest(TestCase, OperationInitTest):
 
         # user prevail on "all" and "user_types"
         f_user = CustomForm.objects.create(
-            name="Test", form="operation-general", available=True)
+            name="Test", form="operation-010-general", available=True)
         f_user.users.add(self.user.ishtaruser)
         self.user.ishtaruser.person.person_types.add(tpe)
         response = c.post(url, data)
@@ -1239,7 +1239,7 @@ class CustomFormTest(TestCase, OperationInitTest):
         response = c.post(url, data)
         self.assertNotEqual(response.status_code, 404)
         CustomForm.objects.create(
-            name="Test2", form="operation-collaborators", available=True,
+            name="Test2", form="operation-020-collaborators", available=True,
             apply_to_all=True, enabled=False)
         response = c.post(url, data)
         self.assertEqual(response.status_code, 404)
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index f295e0f9d..a4cb1f673 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -28,8 +28,7 @@ from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from ishtar_common.views import get_item, show_item, revert_item, new_item
 from ishtar_common.wizards import SearchWizard, check_rights_condition
 from ishtar_common.forms import ClosingDateFormSelection
-from ishtar_common.forms_common import AuthorFormset, TownFormset, \
-    SourceDeletionForm
+from ishtar_common.forms_common import AuthorFormset, SourceDeletionForm
 from ishtar_common.models import get_current_profile
 from wizards import *
 from forms import *