From 76eeffe1354cad5683f499cbc68669d1d5237de5 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 21 Mar 2017 19:18:15 +0100
Subject: Finds search: conditionnal search (warehouse module available) for
 warehouses and containers (refs #3416)

---
 archaeological_warehouse/models.py                             | 2 +-
 archaeological_warehouse/templates/ishtar/sheet_container.html | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'archaeological_warehouse')

diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index d3671adf2..d1918f46a 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -183,7 +183,7 @@ class Container(LightHistorizedItem, ImageModel):
                                     null=True, blank=True)
     cached_location = models.CharField(_(u"Cached location"), max_length=500,
                                        null=True, blank=True)
-    index = models.IntegerField(u"Index", default=0)
+    index = models.IntegerField(u"ID", default=0)
     external_id = models.TextField(_(u"External ID"), blank=True, null=True)
     auto_external_id = models.BooleanField(
         _(u"External ID is set automatically"), default=False)
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 38bb79b4f..7845da2c1 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -12,12 +12,13 @@
 
 <p class="window-refs">{{ item.reference|default:"" }}</p>
 <p class="window-refs">{{ item.container_type|default:"" }}</p>
+<p class="window-refs">{{ item.responsible.name }} - {{ item.index }}</p>
 {% include "ishtar/blocks/sheet_external_id.html" %}
 
 <ul class='form-flex'>
     {% field_li_detail "Responsible warehouse" item.responsible %}
-    {% include "ishtar/blocks/sheet_creation_section.html" %}
     {% field_li_detail "Location (warehouse)" item.location %}
+    {% include "ishtar/blocks/sheet_creation_section.html" %}
 </ul>
 {% field "Location" item.precise_location %}
 {% field "Comment" item.comment "<pre>" "</pre>" %}
-- 
cgit v1.2.3