First work to modularize the application (forms corrections)

5 files changed, 15 insertions, 6 deletions

diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py
index efbae4b2b..3835073dd 100644
--- a/ishtar/furnitures/forms.py
+++ b/ishtar/furnitures/forms.py
@@ -676,7 +676,7 @@ class DeletionWizard(Wizard):
     def done(self, request, storage, form_list, **kwargs):
         obj = self.get_current_object(request, storage)
         obj.delete()
-        return render_to_response('wizard_done.html', {},
+        return render_to_response('wizard_delete_done.html', {},
                                   context_instance=RequestContext(request))
 
 class ClosingWizard(Wizard):
@@ -726,6 +726,6 @@ class ClosingWizard(Wizard):
                 if 'end_date' in form.cleaned_data and hasattr(obj, 'end_date'):
                     obj.end_date = form.cleaned_data['end_date']
                     obj.save()
-        return render_to_response('wizard_done.html', {},
+        return render_to_response('wizard_closing_done.html', {},
                                   context_instance=RequestContext(request))
 
diff --git a/ishtar/furnitures/forms_common.py b/ishtar/furnitures/forms_common.py
index ab64babbd..cb147e46f 100644
--- a/ishtar/furnitures/forms_common.py
+++ b/ishtar/furnitures/forms_common.py
@@ -28,6 +28,7 @@ from django.shortcuts import render_to_response
 from django.core import validators
 from django.core.mail import send_mail
 from django.core.exceptions import ObjectDoesNotExist
+from django.forms.formsets import formset_factory, DELETION_FIELD_NAME
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
@@ -36,8 +37,8 @@ from ishtar import settings
 
 import models
 import widgets
-from forms import Wizard, FinalForm, FormSet, formset_factory, reverse_lazy, \
-                  name_validator
+from forms import Wizard, FinalForm, FormSet, reverse_lazy, name_validator,\
+                  clean_duplicated
 
 class PersonWizard(Wizard):
     model = models.Person
diff --git a/ishtar/furnitures/forms_context_records.py b/ishtar/furnitures/forms_context_records.py
index 464b090c1..7cd477c64 100644
--- a/ishtar/furnitures/forms_context_records.py
+++ b/ishtar/furnitures/forms_context_records.py
@@ -21,6 +21,7 @@
 Context records forms definitions
 """
 import datetime
+from itertools import groupby
 
 from django import forms
 from django.core import validators
diff --git a/ishtar/furnitures/forms_files.py b/ishtar/furnitures/forms_files.py
index 4e63fc588..42eeddda2 100644
--- a/ishtar/furnitures/forms_files.py
+++ b/ishtar/furnitures/forms_files.py
@@ -23,6 +23,8 @@ Files forms definitions
 import datetime
 
 from django import forms
+from django.shortcuts import render_to_response
+from django.template import RequestContext
 from django.core import validators
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Max
diff --git a/ishtar/furnitures/forms_operations.py b/ishtar/furnitures/forms_operations.py
index e9d62b7ea..c6b6b9880 100644
--- a/ishtar/furnitures/forms_operations.py
+++ b/ishtar/furnitures/forms_operations.py
@@ -23,6 +23,8 @@ Operations forms definitions
 import datetime
 
 from django import forms
+from django.shortcuts import render_to_response
+from django.template import RequestContext
 from django.core import validators
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Max
@@ -33,7 +35,7 @@ from ishtar import settings
 import models
 import widgets
 from forms import Wizard, FinalForm, FormSet, SearchWizard, ClosingWizard, \
-                  DeletionWizard, formset_factory, get_now, reverse_lazy
+     DeletionWizard, formset_factory, get_now, reverse_lazy, clean_duplicated
 from forms_common import TownForm, TownFormSet, ParcelFormSet, ParcelForm
 
 def is_preventive(form_name, model, type_key='operation_type', key=''):
@@ -474,11 +476,14 @@ operation_closing_wizard = OperationClosingWizard([
                      ('final-operation_closing', FinalOperationClosingForm)],
                       url_name='operation_closing',)
 
+class OperationDeletionWizard(DeletionWizard):
+    model = models.Operation
+
 class OperationDeletionForm(FinalForm):
     confirm_msg = " "
     confirm_end_msg = _(u"Would you like to delete this operation?")
 
-operation_deletion_wizard = DeletionWizard([
+operation_deletion_wizard = OperationDeletionWizard([
                      ('selec-operation_deletion', OperationFormSelection),
                      ('final-operation_deletion', OperationDeletionForm)],
                       url_name='operation_deletion',)