From 9f1d4652d892601b3c690daf04189d0fc7f7bf32 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 19 Apr 2021 17:10:43 +0200
Subject: sheet find: add container index - CSV export: deduplicate
 multi-values

---
 CHANGES.md                                            |  9 +++++++++
 archaeological_finds/templates/ishtar/sheet_find.html | 10 ++++++++++
 ishtar_common/version.py                              |  4 ++--
 ishtar_common/views_item.py                           |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 61c29da6d..36add5f32 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,15 @@
 Ishtar changelog
 ================
 
+v3.1.11 - 2021-04-19
+--------------------
+
+### Features ###
+- sheet find: add container index
+
+### Bug fixes ###
+- CSV export: deduplicate multi-values
+
 v3.1.10 - 2021-04-12
 --------------------
 
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 44a463fe9..57bcc9aef 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -308,6 +308,16 @@
                   </nav>
               </dd>
           </dl>
+          {% if item.container.index %}
+          <div class='row'>
+              <dl class="col-12 flex-wrap">
+                  <dt>{% trans "Index" %}</dt>
+                  <dd>
+                    {{ item.container.location }} - {{ item.container.index }}
+                  </dd>
+              </dl>
+          </div>
+          {% endif %}
           {% endif %}
       </div>
       {% endif %}
diff --git a/ishtar_common/version.py b/ishtar_common/version.py
index 120c379b3..4e8e1c5e8 100644
--- a/ishtar_common/version.py
+++ b/ishtar_common/version.py
@@ -1,5 +1,5 @@
-# 3.1.10
-VERSION = (3, 1, 10)
+# 3.1.11
+VERSION = (3, 1, 11)
 
 
 def get_version():
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index 3787e7d19..daa6ece00 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -1408,7 +1408,7 @@ def _get_data_from_query_old(
                                 "{}{}{}".format(vals[idx], " - ", _format_val(v))
                             )
                     my_vals = new_vals[:]
-            data.append(" & ".join(my_vals) or "")
+            data.append(" & ".join(set(my_vals)) or "")
         if has_lock:
             data.append(item.locked)
             data.append(item.lock_user_id)
-- 
cgit v1.2.3