diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-08 15:39:57 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:24 +0100 |
| commit | 42215dd43672f7aef40c9002f6ef7d5975e6c3ac (patch) | |
| tree | 5a78b78caaf974fe88bf9f26962f808c55404347 | |
| parent | 27c6ee68fb90f47bf7a5a94c6f0eefa09b6e53b9 (diff) | |
| download | Ishtar-42215dd43672f7aef40c9002f6ef7d5975e6c3ac.tar.bz2 Ishtar-42215dd43672f7aef40c9002f6ef7d5975e6c3ac.zip | |
Fix complex ID generation
| -rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_container.html | 1 | ||||
| -rw-r--r-- | ishtar_common/utils.py | 1 |
2 files changed, 1 insertions, 1 deletions
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 = [] |