Container form: fix message when no warehouse is set

3 files changed, 21 insertions, 10 deletions

diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index 65c11b086..e880e2547 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -201,7 +201,7 @@ class ContainerForm(ManageOldType, forms.Form):
 
 class ContainerModifyForm(ContainerForm):
     pk = forms.IntegerField(required=False, widget=forms.HiddenInput)
-    index = forms.IntegerField(_(u"Index"))
+    index = forms.IntegerField(label=_(u"ID"))
 
     def __init__(self, *args, **kwargs):
         super(ContainerModifyForm, self).__init__(*args, **kwargs)
@@ -273,20 +273,20 @@ class LocalisationForm(forms.Form):
     form_label = _(u"Localisation")
 
     def __init__(self, *args, **kwargs):
-        container, warehouse = None, None
+        self.container, self.warehouse = None, None
         if 'warehouse' in kwargs:
-            warehouse = kwargs.pop('warehouse')
+            self.warehouse = kwargs.pop('warehouse')
         if 'container' in kwargs:
-            container = kwargs.pop('container')
+            self.container = kwargs.pop('container')
         super(LocalisationForm, self).__init__(*args, **kwargs)
-        if not warehouse:
+        if not self.warehouse:
             return
-        for divlink in warehouse.warehousedivisionlink_set.order_by(
+        for divlink in self.warehouse.warehousedivisionlink_set.order_by(
                 'order').all():
             initial = u"-"
-            if container:
+            if self.container:
                 q = models.ContainerLocalisation.objects.filter(
-                    division=divlink, container=container)
+                    division=divlink, container=self.container)
                 if q.count():
                     initial = q.all()[0].reference
             self.fields['division_{}'.format(divlink.pk)] = forms.CharField(
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
index 4a21368ae..2e817ff41 100644
--- a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
@@ -1,7 +1,16 @@
 {% extends "ishtar/wizard/default_wizard.html" %}
 {% load i18n %}
+{% load url from future %}
 {% block form_head %}
 {% if not wizard.form.fields %}
-<p class='warning'>{% trans "No division set for this warehouse. Define it to localise container in this warehouse." %}</p>
+<p class='warning'>{% trans "No division set for this warehouse. Define at least one division to localise containers in this warehouse." %}<br/>
+    {{wizard.form.warehouse}}
+    <a href="{% url 'warehouse_modify' wizard.form.warehouse.pk  %}">
+        <span class="fa-stack fa-lg">
+            <i class="fa fa-circle fa-stack-2x"></i>
+            <i class="fa fa-pencil fa-stack-1x fa-inverse"></i>
+        </span>
+    </a>
+</p>
 {% endif %}
 {% endblock %}
diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py
index 42659ae23..9ecc16b3f 100644
--- a/archaeological_warehouse/wizards.py
+++ b/archaeological_warehouse/wizards.py
@@ -73,7 +73,9 @@ 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']