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, 10 insertions, 2 deletions

diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py
index 0adb06f75..9ecc16b3f 100644
--- a/archaeological_warehouse/wizards.py
+++ b/archaeological_warehouse/wizards.py
@@ -73,10 +73,13 @@ class WarehouseDeletionWizard(DeletionWizard):
 class ContainerWizard(Wizard):
     model = models.Container
     wizard_templates = {
-        'localisation-container_localisation':
+        'localisation-container_creation':
+            'ishtar/wizard/wizard_containerlocalisation.html',
+        'localisation-container_modification':
             'ishtar/wizard/wizard_containerlocalisation.html',
     }
     ignore_init_steps = ['localisation']
+    wizard_done_window = reverse_lazy('show-container')
 
     def get_form_kwargs(self, step=None):
         kwargs = super(ContainerWizard, self).get_form_kwargs(step)
@@ -98,6 +101,7 @@ class ContainerWizard(Wizard):
         Save the localisation
         """
         super(ContainerWizard, self).done(form_list)
+        dct = {}
         for idx, form in enumerate(form_list):
             if not form.is_valid():
                 return self.render(form)
@@ -119,8 +123,12 @@ class ContainerWizard(Wizard):
                         )
                     localisation.reference = form.cleaned_data[div_name]
                     localisation.save()
+            dct = {'item': container}
+            self.current_object = container
+            # force evaluation of lazy urls
+            dct['wizard_done_window'] = unicode(self.wizard_done_window)
         return render_to_response(
-            self.wizard_done_template, {},
+            self.wizard_done_template, dct,
             context_instance=RequestContext(self.request))