diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-20 17:29:41 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-20 17:29:41 +0200 |
commit | cd1fcb7f22cd2a5de22a33eade9ab4d38b2fa54a (patch) | |
tree | 7e360ddf84075d6026b96f8a7cd79bdf649388c7 /ishtar_common/views.py | |
parent | 9f98338863f1545f80495ee8a0ffbf4411a04381 (diff) | |
parent | 1b246239c77b23c5b8d062057d2bf885716a0e15 (diff) | |
download | Ishtar-cd1fcb7f22cd2a5de22a33eade9ab4d38b2fa54a.tar.bz2 Ishtar-cd1fcb7f22cd2a5de22a33eade9ab4d38b2fa54a.zip |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/views.py')
-rw-r--r-- | ishtar_common/views.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 5786391cc..86c87d049 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1635,8 +1635,9 @@ class DisplayItemView(IshtarMixin, LoginRequiredMixin, TemplateView): def get_context_data(self, *args, **kwargs): data = super(DisplayItemView, self).get_context_data(*args, **kwargs) - data['pk'] = unicode(kwargs.get('pk')) + '/' - data['item_url'] = 'show-' + kwargs.get('item_type') + pk = unicode(kwargs.get('pk')) + '/' + item_url = '/show-' + kwargs.get('item_type') + data['show_url'] = item_url + "/" + pk return data |