Adapt forms, wizards, views, urls for new management of documents (refs #4107)

3 files changed, 4 insertions, 25 deletions

diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index 27f03e752..e13255efc 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -33,8 +33,7 @@ from bootstrap_datepicker.widgets import DatePicker
 from ishtar_common.forms import name_validator, reverse_lazy, \
     get_form_selection, TableSelect, ManageOldType, FinalForm, FormSet, \
     CustomForm, FieldType
-from ishtar_common.forms_common import get_image_help, BaseImageFormset, \
-    BaseImageForm
+from ishtar_common.forms_common import get_image_help
 from archaeological_finds.forms import FindMultipleFormSelection, \
     SelectFindBasketForm
 
@@ -161,14 +160,6 @@ class WarehouseForm(CustomForm, ManageOldType, forms.Form):
         return new_item
 
 
-ImagesFormset = formset_factory(BaseImageForm, can_delete=True,
-                                formset=BaseImageFormset)
-ImagesFormset.file_upload = True
-ImagesFormset.form_label = _(u"Images")
-ImagesFormset.form_admin_name = _(u"Warehouse - 025 - Images")
-ImagesFormset.form_slug = "warehouse-020-images"
-
-
 class WarehouseDeletionForm(FinalForm):
     confirm_msg = _(u"Would you like to delete this warehouse?")
     confirm_end_msg = _(u"Would you like to delete this warehouse?")
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 30c117fc2..48cc042f8 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -29,7 +29,7 @@ from django.utils.translation import ugettext_lazy as _
 from ishtar_common.data_importer import post_importer_action
 from ishtar_common.models import Document, GeneralType, get_external_id, \
     LightHistorizedItem, OwnPerms, Address, Person, post_save_cache, \
-    ImageModel, DashboardFormItem, IshtarImage, ThroughImage
+    ImageModel, DashboardFormItem
 from ishtar_common.utils import cached_label_changed
 
 
@@ -65,8 +65,6 @@ class Warehouse(Address, DashboardFormItem, OwnPerms):
     documents = models.ManyToManyField(
         Document, related_name='warehouses', verbose_name=_(u"Documents"),
         blank=True)
-    images = models.ManyToManyField(IshtarImage, verbose_name=_(u"Images"),
-                                    through='WarehouseImage', blank=True)
     external_id = models.TextField(_(u"External ID"), blank=True, null=True)
     auto_external_id = models.BooleanField(
         _(u"External ID is set automatically"), default=False)
@@ -210,11 +208,6 @@ class Warehouse(Address, DashboardFormItem, OwnPerms):
                 return
 
 
-class WarehouseImage(ThroughImage):
-    item = models.ForeignKey(Warehouse, on_delete=models.CASCADE,
-                             related_name='associated_images')
-
-
 class Collection(LightHistorizedItem):
     name = models.CharField(_(u"Name"), max_length=200,
                             null=True, blank=True)
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index 913fbd3be..c801fbae6 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -22,16 +22,13 @@ import json
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse
-from django.utils.translation import ugettext_lazy as _
 from django.shortcuts import redirect
+from django.utils.translation import ugettext_lazy as _
 
-import models
-
+from forms import *
 from ishtar_common.views import get_item, new_item, show_item
 from ishtar_common.wizards import SearchWizard
 from wizards import *
-from ishtar_common.forms import FinalForm
-from forms import *
 
 get_container = get_item(models.Container, 'get_container', 'container')
 show_container = show_item(models.Container, 'container')
@@ -103,7 +100,6 @@ warehouse_search_wizard = SearchWizard.as_view([
 
 warehouse_creation_steps = [
     ("warehouse-warehouse_creation", WarehouseForm),
-    ('images-warehouse_creation', ImagesFormset),
     ('divisions-warehouse_creation', SelectedDivisionFormset),
     ('final-warehouse_creation', FinalForm)]
 
@@ -117,7 +113,6 @@ warehouse_creation_wizard = WarehouseWizard.as_view(
 warehouse_modification_wizard = WarehouseModificationWizard.as_view([
     ('selec-warehouse_modification', WarehouseFormSelection),
     ("warehouse-warehouse_modification", WarehouseForm),
-    ('images-warehouse_modifcation', ImagesFormset),
     ('divisions-warehouse_modification', SelectedDivisionFormset),
     ('final-warehouse_modification', FinalForm)],
     label=_(u"Warehouse modification"),