From 620d3a62d3a569af9aee6ef5590b779b82e6a8b7 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 8 Feb 2021 15:39:57 +0100
Subject: Fix complex ID generation

---
 archaeological_warehouse/templates/ishtar/sheet_container.html | 1 -
 ishtar_common/utils.py                                         | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index dd3c5b5ab..7ffafa7f6 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -69,7 +69,6 @@
                             title="{% trans 'Complete identifier' %}">
                 <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
                 <p class="window-refs">{{ item.container_type|default:"" }} {{ item.reference|default:"" }}</p>
-                <p class="window-refs">{{ item.location.name }} - {{ item.index }}</p>
                 {% include "ishtar/blocks/sheet_external_id.html" %}
             </div>
             {% if item.main_image %}
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index aad995198..a1a81cc3e 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -1835,6 +1835,7 @@ def get_generated_id(key, item):
             res = []
             for keys2 in sub_key_list:
                 res += keys2.split(" and ")
+            key_list += [k.split(" ")[0] for k in res]
 
         key_list = map(lambda x: x.strip(), key_list)
         new_keys = []
-- 
cgit v1.2.3