From 47d9f3f37d3c05064d64528ad8b11887a30bc5b6 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 30 Jan 2017 14:55:01 +0100
Subject: Shortcut menu: fix menu when current item is not owned

---
 ishtar_common/tests.py | 13 +++++++++++++
 ishtar_common/views.py |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 3273db19b..9ced28ea6 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -417,6 +417,19 @@ class ShortMenuTest(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertFalse(str(ope.cached_label) in response.content)
 
+        # test current is not owned
+        ope.end_date = None
+        ope.history_creator = self.other_user
+        ope.in_charge = None
+        ope.scientist = None
+        ope.save()
+        session = c.session
+        session[ope.SLUG] = ope.pk
+        session.save()
+        response = c.get(reverse('shortcut-menu'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(str(ope.cached_label) in response.content)
+
     def testFile(self):
         from archaeological_files.models import File, FileType
         c = Client()
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index b7ef5ea47..e8ae1a458 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -297,7 +297,7 @@ def shortcut_menu(request):
                 item = model.objects.get(pk=int(current))
                 new_selected_item = item.pk
                 items.append((item.pk, shortify(unicode(item), 60),
-                              True, item.get_short_menu_class()))
+                              True, item.get_short_menu_class(item.pk)))
             except (model.DoesNotExist, ValueError):
                 pass
         if items:
-- 
cgit v1.2.3


From bd0b2ee98e76ada212d67e5e14c5e5c6d2650593 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 30 Jan 2017 15:09:41 +0100
Subject: v0.99.7.1

---
 CHANGES.md | 7 +++++++
 version.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 02bbd08e2..06d2dc744 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,13 @@
 Ishtar changelog
 ================
 
+0.99.7.1 (2017-01-30)
+---------------------
+
+### Bug fixes ###
+
+- Fix shortcut menu for not owned current items
+
 0.99.7 (2017-01-30)
 -------------------
 
diff --git a/version.py b/version.py
index 43f9c5cba..e146d3b35 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 99, 7)
+VERSION = (0, 99, 7, 1)
 
 
 def get_version():
-- 
cgit v1.2.3