Deletion and searches for warehouses (refs #3366)

5 files changed, 34 insertions, 0 deletions

diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index d571364a4..d61658b0e 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -141,6 +141,11 @@ class WarehouseForm(ManageOldType, forms.Form):
         return new_item
 
 
+class WarehouseDeletionForm(FinalForm):
+    confirm_msg = _(u"Would you like to delete this warehouse?")
+    confirm_end_msg = _(u"Would you like to delete this warehouse?")
+
+
 class ContainerForm(ManageOldType, forms.Form):
     form_label = _(u"Container")
     associated_models = {'container_type': models.ContainerType,
diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py
index a44bbee1d..c240cba84 100644
--- a/archaeological_warehouse/ishtar_menu.py
+++ b/archaeological_warehouse/ishtar_menu.py
@@ -39,12 +39,18 @@ MENU_SECTIONS = [
     (80, SectionItem('warehouse', _(u"Warehouse"),
      profile_restriction='warehouse',
      childs=[
+         MenuItem('warehouse_search', _(u"Search"),
+                  model=models.Warehouse,
+                  access_controls=['view_warehouse',]),
          MenuItem('warehouse_creation', _(u"Creation"),
                   model=models.Warehouse,
                   access_controls=['add_warehouse',]),
          MenuItem('warehouse_modification', _(u"Modification"),
                   model=models.Warehouse,
                   access_controls=['change_warehouse',]),
+         MenuItem('warehouse_deletion', _(u"Deletion"),
+                  model=models.Warehouse,
+                  access_controls=['change_warehouse',]),
          SectionItem(
              'containers', _(u"Containers"),
              childs=[
diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index 4a3041ada..133d4ae79 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -50,6 +50,9 @@ urlpatterns += patterns(
         'autocomplete_container', name='autocomplete-container'),
     url(r'^show-container(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_container',
         name=models.Container.SHOW_URL),
+    url(r'^warehouse_search/(?P<step>.+)?$',
+        check_rights(['view_warehouse', 'view_own_warehouse'])(
+            views.warehouse_search_wizard), name='warehouse_search'),
     url(r'^warehouse_creation/(?P<step>.+)?$',
         check_rights(['add_warehouse'])(
             views.warehouse_creation_wizard), name='warehouse_creation'),
@@ -57,6 +60,10 @@ urlpatterns += patterns(
         check_rights(['change_warehouse'])(
             views.warehouse_modification_wizard),
         name='warehouse_modification'),
+    url(r'^warehouse_deletion/(?P<step>.+)?$',
+        check_rights(['change_warehouse'])(
+            views.warehouse_deletion_wizard),
+        name='warehouse_deletion'),
     url(r'^container_search/(?P<step>.+)?$',
         check_rights(['change_warehouse'])(
             views.container_search_wizard),
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index 5cf4ea345..35218cd07 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -93,6 +93,12 @@ 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),
@@ -110,6 +116,12 @@ warehouse_modification_wizard = WarehouseModificationWizard.as_view([
     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"),
diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py
index 0d73d9fd5..817ed75a5 100644
--- a/archaeological_warehouse/wizards.py
+++ b/archaeological_warehouse/wizards.py
@@ -66,6 +66,10 @@ class WarehouseModificationWizard(Wizard):
     wizard_done_window = reverse_lazy('show-warehouse')
 
 
+class WarehouseDeletionWizard(DeletionWizard):
+    model = models.Warehouse
+
+
 class ContainerWizard(Wizard):
     model = models.Container
     wizard_templates = {