Warehouse - Container: add a Modify button to sheets (refs #3453, refs #3518)

4 files changed, 27 insertions, 3 deletions

diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index cd8a3602b..172719604 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -4,7 +4,7 @@
 {% block head_title %}{% trans "Container" %}{% endblock %}
 
 {% block content %}
-{% window_nav item window_id 'show-container' '' '' '' previous next 1 %}
+{% window_nav item window_id 'show-container' 'container_modify' '' '' previous next 1 %}
 
 <p class="window-refs">{{ item.reference|default:"" }}</p>
 <p class="window-refs">{{ item.container_type|default:"" }}</p>
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
index 410108a52..c31fc93b4 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -4,7 +4,7 @@
 {% block head_title %}{% trans "Warehouse" %}{% endblock %}
 
 {% block content %}
-{% window_nav item window_id 'show-warehouse' '' '' '' previous next 1 %}
+{% window_nav item window_id 'show-warehouse' 'warehouse_modify' '' '' previous next 1 %}
 
 <p class="window-refs">{{ item.name|default:"" }}</p>
 <p class="window-refs">{{ item.warehouse_type|default:"" }}</p>
diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index 133d4ae79..e5920606a 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -64,6 +64,9 @@ urlpatterns += patterns(
         check_rights(['change_warehouse'])(
             views.warehouse_deletion_wizard),
         name='warehouse_deletion'),
+    url(r'warehouse-modify/(?P<pk>.+)/$',
+        views.warehouse_modify, name='warehouse_modify'),
+
     url(r'^container_search/(?P<step>.+)?$',
         check_rights(['change_warehouse'])(
             views.container_search_wizard),
@@ -80,4 +83,6 @@ urlpatterns += patterns(
         check_rights(['change_warehouse'])(
             views.container_deletion_wizard),
         name='container_deletion'),
-)
+    url(r'container-modify/(?P<pk>.+)/$',
+        views.container_modify, name='container_modify'),
+)
\ No newline at end of file
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index 06b3c9432..677539a3f 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -19,9 +19,11 @@
 
 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
 
 import models
 
@@ -120,6 +122,15 @@ warehouse_modification_wizard = WarehouseModificationWizard.as_view([
     url_name='warehouse_modification',
 )
 
+
+def warehouse_modify(request, pk):
+    WarehouseModificationWizard.session_set_value(
+        request, 'selec-warehouse_modification', 'pk', pk, reset=True)
+    return redirect(
+        reverse('warehouse_modification',
+                kwargs={'step': 'warehouse-warehouse_modification'}))
+
+
 warehouse_deletion_wizard = WarehouseDeletionWizard.as_view([
     ('selec-warehouse_deletion', WarehouseFormSelection),
     ('final-warehouse_deletion', WarehouseDeletionForm)],
@@ -152,6 +163,14 @@ container_modification_wizard = ContainerModificationWizard.as_view([
     url_name='container_modification',
 )
 
+
+def container_modify(request, pk):
+    ContainerModificationWizard.session_set_value(
+        request, 'selec-container_modification', 'pk', pk, reset=True)
+    return redirect(
+        reverse('container_modification',
+                kwargs={'step': 'container-container_modification'}))
+
 container_deletion_wizard = ContainerDeletionWizard.as_view([
     ('selec-container_deletion', MainContainerFormSelection),
     ('final-container_deletion', ContainerDeletionForm)],