Djangoization - Major refactoring (step 10)

* Fix operation wizards
* Minor fix on other wizards

1 files changed, 103 insertions, 101 deletions

diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index c00624fe1..38e2a1bc4 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -22,6 +22,7 @@ import json
 from django.db.models import Q
 from django.http import HttpResponse
 from django.shortcuts import render_to_response
+from django.utils.translation import ugettext_lazy as _
 
 from ishtar_common.views import get_item, show_item, revert_item
 from ishtar_common.wizards import SearchWizard
@@ -95,130 +96,131 @@ def dashboard_operation(request, dct, obj_id=None, *args, **kwargs):
                               context_instance=RequestContext(request))
 
 operation_search_wizard = SearchWizard.as_view([
-                          ('general-operation_search', OperationFormSelection)],
-                          label=_(u"Operation search"),
-                          url_name='operation_search',)
+    ('general-operation_search', OperationFormSelection)],
+    label=_(u"Operation search"),
+    url_name='operation_search',)
 
 operation_creation_wizard = OperationWizard.as_view([
-           ('general-operation_creation', OperationFormGeneral),
-           ('preventive-operation_creation', OperationFormPreventive),
-           ('preventivediag-operation_creation', OperationFormPreventiveDiag),
-           ('townsgeneral-operation_creation', TownFormset),
-           ('towns-operation_creation', SelectedTownFormset),
-           ('parcelsgeneral-operation_creation', SelectedParcelGeneralFormSet),
-           ('parcels-operation_creation', SelectedParcelFormSet),
-           ('remains-operation_creation', RemainFormset),
-           ('periods-operation_creation', PeriodFormset),
-           ('final-operation_creation', FinalForm)],
-           label=_(u"Operation creation"),
-           condition_dict={
-                     'preventive-operation_creation':\
-                            is_preventive('general-operation_creation',
-                                          models.OperationType,
-                                          'operation_type', 'prev_excavation'),
-                     'preventivediag-operation_creation':\
-                            is_preventive('general-operation_creation',
-                                          models.OperationType,
-                                          'operation_type', 'arch_diagnostic'),
-                     'townsgeneral-operation_creation':has_associated_file(
-                                     'general-operation_creation', negate=True),
-                     'towns-operation_creation':has_associated_file(
-                                     'general-operation_creation'),
-                     'parcelsgeneral-operation_creation':has_associated_file(
-                                     'general-operation_creation', negate=True),
-                     'parcels-operation_creation':has_associated_file(
-                                     'general-operation_creation'),
-                            },
-           url_name='operation_creation',)
+    ('general-operation_creation', OperationFormGeneral),
+    ('preventive-operation_creation', OperationFormPreventive),
+    ('preventivediag-operation_creation', OperationFormPreventiveDiag),
+    ('townsgeneral-operation_creation', TownFormset),
+    ('towns-operation_creation', SelectedTownFormset),
+    ('parcelsgeneral-operation_creation', SelectedParcelGeneralFormSet),
+    ('parcels-operation_creation', SelectedParcelFormSet),
+    ('remains-operation_creation', RemainFormset),
+    ('periods-operation_creation', PeriodFormset),
+    ('final-operation_creation', FinalForm)],
+    label=_(u"Operation creation"),
+    condition_dict={
+        'preventive-operation_creation':\
+            is_preventive('general-operation_creation', models.OperationType,
+            'operation_type', 'prev_excavation'),
+        'preventivediag-operation_creation':\
+            is_preventive('general-operation_creation', models.OperationType,
+            'operation_type', 'arch_diagnostic'),
+        'townsgeneral-operation_creation':has_associated_file(
+            'general-operation_creation', negate=True),
+        'towns-operation_creation':has_associated_file(
+            'general-operation_creation'),
+        'parcelsgeneral-operation_creation':has_associated_file(
+            'general-operation_creation', negate=True),
+        'parcels-operation_creation':has_associated_file(
+            'general-operation_creation'),
+    },
+    url_name='operation_creation',)
 
 operation_modification_wizard = OperationModificationWizard.as_view([
-         ('selec-operation_modification', OperationFormSelection),
-         ('general-operation_modification', OperationFormGeneral),
-         ('preventive-operation_modification', OperationFormPreventive),
-         ('preventivediag-operation_modification', OperationFormPreventiveDiag),
-         ('towns-operation_modification', SelectedTownFormset),
-         ('townsgeneral-operation_modification', TownFormset),
-         ('parcels-operation_modification', SelectedParcelFormSet),
-         ('parcelsgeneral-operation_modification', SelectedParcelGeneralFormSet),
-         ('remains-operation_modification', RemainFormset),
-         ('periods-operation_modification', PeriodFormset),
-         ('final-operation_modification', FinalForm)],
-         label=_(u"Operation modification"),
-         condition_dict={
-            'preventive-operation_modification':is_preventive(
-                         'general-operation_modification', models.OperationType,
-                         'operation_type', 'prev_excavation'),
-            'preventivediag-operation_modification':is_preventive(
-                         'general-operation_modification', models.OperationType,
-                         'operation_type', 'arch_diagnostic'),
-            'townsgeneral-operation_modification':has_associated_file(
-                                 'general-operation_modification', negate=True),
-            'towns-operation_modification':has_associated_file(
-                                 'general-operation_modification'),
-            'parcelsgeneral-operation_modification':has_associated_file(
-                                 'general-operation_modification', negate=True),
-            'parcels-operation_modification':has_associated_file(
-                                 'general-operation_modification'),
-                            },
-         url_name='operation_modification',)
+    ('selec-operation_modification', OperationFormSelection),
+    ('general-operation_modification', OperationFormGeneral),
+    ('preventive-operation_modification', OperationFormPreventive),
+    ('preventivediag-operation_modification', OperationFormPreventiveDiag),
+    ('towns-operation_modification', SelectedTownFormset),
+    ('townsgeneral-operation_modification', TownFormset),
+    ('parcels-operation_modification', SelectedParcelFormSet),
+    ('parcelsgeneral-operation_modification', SelectedParcelGeneralFormSet),
+    ('remains-operation_modification', RemainFormset),
+    ('periods-operation_modification', PeriodFormset),
+    ('final-operation_modification', FinalForm)],
+    label=_(u"Operation modification"),
+    condition_dict={
+        'preventive-operation_modification':is_preventive(
+            'general-operation_modification', models.OperationType,
+            'operation_type', 'prev_excavation'),
+        'preventivediag-operation_modification':is_preventive(
+            'general-operation_modification', models.OperationType,
+            'operation_type', 'arch_diagnostic'),
+        'townsgeneral-operation_modification':has_associated_file(
+            'general-operation_modification', negate=True),
+        'towns-operation_modification':has_associated_file(
+            'general-operation_modification'),
+        'parcelsgeneral-operation_modification':has_associated_file(
+            'general-operation_modification', negate=True),
+        'parcels-operation_modification':has_associated_file(
+            'general-operation_modification'),
+         },
+    url_name='operation_modification',)
 
 operation_closing_wizard = OperationClosingWizard.as_view([
-                     ('selec-operation_closing', OperationFormSelection),
-                     ('date-operation_closing', ClosingDateFormSelection),
-                     ('final-operation_closing', FinalOperationClosingForm)],
-                      label=_(u"Operation closing"),
-                      url_name='operation_closing',)
+    ('selec-operation_closing', OperationFormSelection),
+    ('date-operation_closing', ClosingDateFormSelection),
+    ('final-operation_closing', FinalOperationClosingForm)],
+    label=_(u"Operation closing"),
+    url_name='operation_closing',)
 
 operation_deletion_wizard = OperationDeletionWizard.as_view([
-                     ('selec-operation_deletion', OperationFormSelection),
-                     ('final-operation_deletion', OperationDeletionForm)],
-                      label=_(u"Operation deletion"),
-                      url_name='operation_deletion',)
+    ('selec-operation_deletion', OperationFormSelection),
+    ('final-operation_deletion', OperationDeletionForm)],
+    label=_(u"Operation deletion"),
+    url_name='operation_deletion',)
 
 operation_source_creation_wizard = OperationSourceWizard.as_view([
-             ('selec-operation_source_creation', SourceOperationFormSelection),
-             ('source-operation_source_creation',OperationSourceForm),
-             ('authors-operation_source_creation', AuthorFormset),
-             ('final-operation_source_creation', FinalForm)],
-              label=_(u"Operation: source creation"),
-              url_name='operation_source_creation',)
+    ('selec-operation_source_creation', SourceOperationFormSelection),
+    ('source-operation_source_creation',OperationSourceForm),
+    ('authors-operation_source_creation', AuthorFormset),
+    ('final-operation_source_creation', FinalForm)],
+    label=_(u"Operation: source creation"),
+    url_name='operation_source_creation',)
 
 operation_source_modification_wizard = OperationSourceWizard.as_view([
-         ('selec-operation_source_modification', OperationSourceFormSelection),
-         ('source-operation_source_modification', OperationSourceForm),
-         ('authors-operation_source_modification', AuthorFormset),
-         ('final-operation_source_modification', FinalForm)],
-          label=_(u"Operation: source modification"),
-          url_name='operation_source_modification',)
+    ('selec-operation_source_modification', OperationSourceFormSelection),
+    ('source-operation_source_modification', OperationSourceForm),
+    ('authors-operation_source_modification', AuthorFormset),
+    ('final-operation_source_modification', FinalForm)],
+    label=_(u"Operation: source modification"),
+    url_name='operation_source_modification',)
 
 operation_source_deletion_wizard = OperationSourceDeletionWizard.as_view([
-         ('selec-operation_source_deletion', OperationSourceFormSelection),
-         ('final-operation_source_deletion', SourceDeletionForm)],
-          label=_(u"Operation: source deletion"),
-          url_name='operation_source_deletion',)
+    ('selec-operation_source_deletion', OperationSourceFormSelection),
+    ('final-operation_source_deletion', SourceDeletionForm)],
+    label=_(u"Operation: source deletion"),
+    url_name='operation_source_deletion',)
 
 operation_administrativeactop_wizard = \
                                 OperationAdministrativeActWizard.as_view([
     ('selec-operation_administrativeactop', OperationFormSelection),
-    ('administrativeact-operation_administrativeactop', AdministrativeActOpeForm),
+    ('administrativeact-operation_administrativeactop',
+     AdministrativeActOpeForm),
     ('final-operation_administrativeactop', FinalForm)],
-     label=_(u"Operation: new administrative act"),
-     url_name='operation_administrativeactop',)
+    label=_(u"Operation: new administrative act"),
+    url_name='operation_administrativeactop',)
 
 operation_administrativeactop_modification_wizard = \
                                 OperationEditAdministrativeActWizard.as_view([
-       ('selec-operation_administrativeactop_modification',
-                                            AdministrativeActOpeFormSelection),
-       ('administrativeact-operation_administrativeactop_modification',
-                                            AdministrativeActOpeForm),
-       ('final-operation_administrativeactop_modification', FinalForm)],
-       url_name='operation_administrativeactop_modification',)
+    ('selec-operation_administrativeactop_modification',
+     AdministrativeActOpeFormSelection),
+    ('administrativeact-operation_administrativeactop_modification',
+     AdministrativeActOpeForm),
+    ('final-operation_administrativeactop_modification', FinalForm)],
+    label=_(u"Operation: administrative act modification"),
+    url_name='operation_administrativeactop_modification',)
 
 operation_administrativeactop_deletion_wizard = \
                                 AdministrativeActDeletionWizard.as_view([
-                     ('selec-operation_administrativeactop_deletion',
-                                 AdministrativeActOpeFormSelection),
-                     ('final-operation_administrativeactop_deletion',
-                                 FinalAdministrativeActDeleteForm)],
-                      url_name='operation_administrativeactop_deletion',)
+    ('selec-operation_administrativeactop_deletion',
+     AdministrativeActOpeFormSelection),
+    ('final-operation_administrativeactop_deletion',
+     FinalAdministrativeActDeleteForm)],
+    label=_(u"Operation: administrative act deletion"),
+    url_name='operation_administrativeactop_deletion',)