diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-20 17:28:52 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-20 17:28:52 +0200 |
| commit | 1b246239c77b23c5b8d062057d2bf885716a0e15 (patch) | |
| tree | 3b8539fd9a95555c6154b4a00f4e31b9693d1768 /ishtar_common/views.py | |
| parent | 4aa6e59b2968e14e9f111fa4f3fceb874c91ca4b (diff) | |
| parent | c89fd76e88e9d345399d7565803fa3b6c0e7fa21 (diff) | |
| download | Ishtar-1b246239c77b23c5b8d062057d2bf885716a0e15.tar.bz2 Ishtar-1b246239c77b23c5b8d062057d2bf885716a0e15.zip | |
Merge branch 'master' into v0.9
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 |