diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-18 05:15:32 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-18 05:15:32 +0200 |
| commit | 0fb818b5fd0ca7b0b7c1f439213dd87b4d6fb73f (patch) | |
| tree | 663b53912ee6e1f8267354ba920ba25febd0a1d4 /ishtar_common | |
| parent | d8fd8310ecc13561a89662eabdad92d5c3908206 (diff) | |
| parent | 6b578aad2bf9d226da65b6562b2c991a257500d8 (diff) | |
| download | Ishtar-0fb818b5fd0ca7b0b7c1f439213dd87b4d6fb73f.tar.bz2 Ishtar-0fb818b5fd0ca7b0b7c1f439213dd87b4d6fb73f.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ishtar_common')
| -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 2feb49bc0..0f1397758 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1652,8 +1652,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 |