Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

1 files changed, 65 insertions, 1 deletions

diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index d8027a9a6..35218cd07 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -23,13 +23,19 @@ from django.db.models import Q
 from django.http import HttpResponse
 from django.utils.translation import ugettext_lazy as _
 
-from ishtar_common.views import get_item, new_item
 import models
+
+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')
+
+get_warehouse = get_item(models.Warehouse, 'get_warehouse', 'warehouse')
+show_warehouse = show_item(models.Warehouse, 'warehouse')
 
 new_warehouse = new_item(models.Warehouse, WarehouseForm)
 new_container = new_item(models.Container, ContainerForm)
@@ -87,6 +93,64 @@ warehouse_packaging_wizard = PackagingWizard.as_view([
     label=_(u"Packaging"),
     url_name='warehouse_packaging',)
 
+warehouse_search_wizard = SearchWizard.as_view([
+    ('selec-warehouse_search', WarehouseFormSelection)],
+    label=_(u"Warehouse search"),
+    url_name='warehouse_search',
+)
+
+warehouse_creation_wizard = WarehouseWizard.as_view([
+    ("warehouse-warehouse_creation", WarehouseForm),
+    ('divisions-warehouse_creation', SelectedDivisionFormset),
+    ('final-warehouse_creation', FinalForm)],
+    label=_(u"Warehouse creation"),
+    url_name='warehouse_creation',
+)
+
+warehouse_modification_wizard = WarehouseModificationWizard.as_view([
+    ('selec-warehouse_modification', WarehouseFormSelection),
+    ("warehouse-warehouse_modification", WarehouseForm),
+    ('divisions-warehouse_modification', SelectedDivisionFormset),
+    ('final-warehouse_modification', FinalForm)],
+    label=_(u"Warehouse modification"),
+    url_name='warehouse_modification',
+)
+
+warehouse_deletion_wizard = WarehouseDeletionWizard.as_view([
+    ('selec-warehouse_deletion', WarehouseFormSelection),
+    ('final-warehouse_deletion', WarehouseDeletionForm)],
+    label=_(u"Warehouse deletion"),
+    url_name='warehouse_deletion',)
+
+container_search_wizard = SearchWizard.as_view([
+    ('selec-container_search', MainContainerFormSelection)],
+    label=_(u"Container search"),
+    url_name='container_search',
+)
+
+container_creation_wizard = ContainerWizard.as_view([
+    ('container-container_creation', ContainerForm),
+    ('localisation-container_creation', LocalisationForm),
+    ('final-container_creation', FinalForm)],
+    label=_(u"Container creation"),
+    url_name='container_creation',
+)
+
+container_modification_wizard = ContainerModificationWizard.as_view([
+    ('selec-container_modification', MainContainerFormSelection),
+    ('container-container_modification', ContainerModifyForm),
+    ('localisation-container_modification', LocalisationForm),
+    ('final-container_modification', FinalForm)],
+    label=_(u"Container modification"),
+    url_name='container_modification',
+)
+
+container_deletion_wizard = ContainerDeletionWizard.as_view([
+    ('selec-container_deletion', MainContainerFormSelection),
+    ('final-container_deletion', ContainerDeletionForm)],
+    label=_(u"Container deletion"),
+    url_name='container_deletion',)
+
 """
 warehouse_packaging_wizard = ItemSourceWizard.as_view([
          ('selec-warehouse_packaging', ItemsSelection),