summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ishtar_common/tests.py13
-rw-r--r--ishtar_common/views.py2
2 files changed, 14 insertions, 1 deletions
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: