diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-30 15:09:57 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-30 15:09:57 +0100 |
| commit | 4a6c5fa994e583ba057eb78e398c626c41144636 (patch) | |
| tree | 2587fa54b5df202bc01e52d311a051e32801b61d /ishtar_common | |
| parent | 08da2171c978689701492c60848b865dcd0df04f (diff) | |
| parent | bd0b2ee98e76ada212d67e5e14c5e5c6d2650593 (diff) | |
| download | Ishtar-4a6c5fa994e583ba057eb78e398c626c41144636.tar.bz2 Ishtar-4a6c5fa994e583ba057eb78e398c626c41144636.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/tests.py | 13 | ||||
| -rw-r--r-- | ishtar_common/views.py | 2 |
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: |