Merge branch 'master' into v0.9

Conflicts:
	Makefile.example
	archaeological_operations/migrations/0061_regenerate_cached_label.py
	archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py

1 files changed, 19 insertions, 0 deletions

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)],