Djangoization - Major refactoring (step 13)

* Fix finds wizards
* Clean-up an unecessary file

2 files changed, 26 insertions, 51 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 9c682b25a..c5480d8a8 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -34,13 +34,13 @@ from django.utils.translation import ugettext_lazy as _
 from ishtar_common.models import Person, valid_id, valid_ids
 from archaeological_operations.models import Period, OperationType
 from archaeological_context_records.models import DatingType, DatingQuality
-from archaeological_warehouse.models import Warehouse, ContainerType, Container
+from archaeological_warehouse.models import Warehouse
 import models
 
 from ishtar_common import widgets
 from ishtar_common.forms import FinalForm, FormSet, FloatField, \
     formset_factory, get_now, get_form_selection, reverse_lazy
-from ishtar_common.forms_common import get_town_field, get_warehouse_field, \
+from ishtar_common.forms_common import get_town_field, \
     SourceForm, SourceSelect, SourceDeletionForm, AuthorFormset
 from archaeological_context_records.forms import RecordFormSelection
 
@@ -155,33 +155,6 @@ class FindMultipleFormSelection(forms.Form):
                                           u"archaeological find."))
         return self.cleaned_data
 
-class ContainerForm(forms.Form):
-    form_label = _(u"Container")
-    reference = forms.CharField(label=_(u"Reference"))
-    container_type = forms.ChoiceField(label=_(u"Container type"), choices=[])
-    location = forms.IntegerField(label=_(u"Warehouse"),
-         widget=widgets.JQueryAutoComplete(
-     reverse_lazy('autocomplete-warehouse'), associated_model=Warehouse,
-     new=True),
-     validators=[valid_id(Warehouse)])
-    comment = forms.CharField(label=_(u"Comment"),
-                              widget=forms.Textarea, required=False)
-
-    def __init__(self, *args, **kwargs):
-        super(ContainerForm, self).__init__(*args, **kwargs)
-        self.fields['container_type'].choices = ContainerType.get_types()
-        self.fields['container_type'].help_text = ContainerType.get_help()
-
-    def save(self, user):
-        dct = self.cleaned_data
-        dct['history_modifier'] = user
-        dct['container_type'] = ContainerType.objects.get(
-                                                    pk=dct['container_type'])
-        dct['location'] = Warehouse.objects.get(pk=dct['location'])
-        new_item = Container(**dct)
-        new_item.save()
-        return new_item
-
 def check_treatment(form_name, type_key, type_list=[], not_type_list=[]):
     type_list = [models.TreatmentType.objects.get(txt_idx=tpe).pk
                  for tpe in type_list]
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index b52e86659..c0ee19c9f 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -68,6 +68,29 @@ find_modification_wizard = FindModificationWizard.as_view([
     label=_(u"Find modification"),
     url_name='find_modification',)
 
+find_source_creation_wizard = FindSourceWizard.as_view([
+    ('selec-find_source_creation', SourceFindFormSelection),
+    ('source-find_source_creation', SourceForm),
+    ('authors-find_source_creation', AuthorFormset),
+    ('final-find_source_creation', FinalForm)],
+    label=_(u"Find: new source"),
+    url_name='find_source_creation',)
+
+find_source_modification_wizard = FindSourceWizard.as_view([
+    ('selec-find_source_modification', FindSourceFormSelection),
+    ('source-find_source_modification', SourceForm),
+    ('authors-find_source_modification', AuthorFormset),
+    ('final-find_source_modification', FinalForm)],
+    label=_(u"Find: source modification"),
+    url_name='find_source_modification',)
+
+find_source_deletion_wizard = FindSourceDeletionWizard.as_view([
+    ('selec-find_source_deletion', FindSourceFormSelection),
+    ('final-find_source_deletion', SourceDeletionForm)],
+    label=_(u"Find: source deletion"),
+    url_name='find_source_deletion',)
+
+"""
 treatment_creation_wizard = TreatmentWizard.as_view([
     ('basetreatment-treatment_creation', BaseTreatmentForm),
     ('selecfind-treatment_creation', UpstreamFindFormSelection),
@@ -97,28 +120,7 @@ treatment_creation_wizard = TreatmentWizard.as_view([
     },
     label=_(u"New treatment"),
     url_name='treatment_creation',)
-
-find_source_creation_wizard = FindSourceWizard.as_view([
-    ('selec-find_source_creation', SourceFindFormSelection),
-    ('source-find_source_creation', SourceForm),
-    ('authors-find_source_creation', AuthorFormset),
-    ('final-find_source_creation', FinalForm)],
-    label=_(u"Find: new source"),
-    url_name='find_source_creation',)
-
-find_source_modification_wizard = FindSourceWizard.as_view([
-    ('selec-find_source_modification', FindSourceFormSelection),
-    ('source-find_source_modification', SourceForm),
-    ('authors-find_source_modification', AuthorFormset),
-    ('final-find_source_modification', FinalForm)],
-    label=_(u"Find: source modification"),
-    url_name='find_source_modification',)
-
-find_source_deletion_wizard = FindSourceDeletionWizard.as_view([
-    ('selec-find_source_deletion', FindSourceFormSelection),
-    ('final-find_source_deletion', SourceDeletionForm)],
-    label=_(u"Find: source deletion"),
-    url_name='find_source_deletion',)
+"""
 
 """
 treatment_source_creation_wizard = TreatmentSourceWizard.as_view([