Merge pull request #594 from liqd/ka-2019-02-fix-export

get absolute urls right to make export work
liqd · Feb 28, 2019 · cfae4b0 · cfae4b0
2 parents c9b12b9 + b0df9b0
commit cfae4b0
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 16 deletions.
diff --git a/liqd_product/apps/budgeting/models.py b/liqd_product/apps/budgeting/models.py
@@ -28,9 +28,12 @@ class Proposal(mapidea_models.AbstractMapIdea):
     )
 
     def get_absolute_url(self):
-        return reverse('liqd_product_budgeting:proposal-detail',
-                       kwargs=dict(pk='{:05d}'.format(self.pk),
-                                   year=self.created.year))
+        return reverse(
+            'liqd_product_budgeting:proposal-detail',
+            kwargs=dict(
+                partner_slug=self.project.organisation.partner.slug,
+                pk='{:05d}'.format(self.pk),
+                year=self.created.year))
 
     class Meta:
         ordering = ['-created']

diff --git a/liqd_product/apps/documents/models.py b/liqd_product/apps/documents/models.py
@@ -25,8 +25,13 @@ def __str__(self):
         return "{}_chapter_{}".format(str(self.module), self.pk)
 
     def get_absolute_url(self):
-        return reverse('liqd_product_documents:chapter-detail',
-                       args=[str(self.pk)])
+        return reverse(
+            'liqd_product_documents:chapter-detail',
+            kwargs=dict(
+                partner_slug=self.project.organisation.partner.slug,
+                pk=str(self.pk)
+            )
+        )
 
     @cached_property
     def prev(self):
@@ -69,8 +74,13 @@ def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
 
     def get_absolute_url(self):
-        return reverse('liqd_product_documents:paragraph-detail',
-                       args=[str(self.pk)])
+        return reverse(
+            'liqd_product_documents:paragraph-detail',
+            kwargs=dict(
+                partner_slug=self.chapter.project.organisation.partner.slug,
+                pk=str(self.pk)
+            )
+        )
 
     @property
     def creator(self):

diff --git a/liqd_product/apps/ideas/models.py b/liqd_product/apps/ideas/models.py
@@ -81,9 +81,14 @@ class Idea(AbstractIdea):
                                object_id_field='object_pk')
 
     def get_absolute_url(self):
-        return reverse('liqd_product_ideas:idea-detail',
-                       kwargs=dict(pk='{:05d}'.format(self.pk),
-                                   year=self.created.year))
+        return reverse(
+            'liqd_product_ideas:idea-detail',
+            kwargs=dict(
+                partner_slug=self.project.organisation.partner.slug,
+                pk='{:05d}'.format(self.pk),
+                year=self.created.year
+            )
+        )
 
     class Meta:
         ordering = ['-created']

diff --git a/liqd_product/apps/mapideas/models.py b/liqd_product/apps/mapideas/models.py
@@ -37,9 +37,14 @@ class MapIdea(AbstractMapIdea):
                                object_id_field='object_pk')
 
     def get_absolute_url(self):
-        return reverse('liqd_product_mapideas:mapidea-detail',
-                       kwargs=dict(pk='{:05d}'.format(self.pk),
-                                   year=self.created.year))
+        return reverse(
+            'liqd_product_mapideas:mapidea-detail',
+            kwargs=dict(
+                partner_slug=self.project.organisation.partner.slug,
+                pk='{:05d}'.format(self.pk),
+                year=self.created.year
+            )
+        )
 
     class Meta:
         ordering = ['-created']

diff --git a/liqd_product/apps/offlineevents/models.py b/liqd_product/apps/offlineevents/models.py
@@ -31,5 +31,10 @@ def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
 
     def get_absolute_url(self):
-        return reverse('liqd_product_offlineevents:offlineevent-detail',
-                       args=[str(self.slug)])
+        return reverse(
+            'liqd_product_offlineevents:offlineevent-detail',
+            kwargs=dict(
+                partner_slug=self.project.organisation.partner.slug,
+                slug=str(self.slug)
+            )
+        )
diff --git a/liqd_product/apps/polls/models.py b/liqd_product/apps/polls/models.py
@@ -1,4 +1,5 @@
 from django.contrib.contenttypes.fields import GenericRelation
+from django.core.urlresolvers import reverse
 from django.db import models
 
 from adhocracy4.comments import models as comment_models
@@ -30,7 +31,13 @@ class Poll(module_models.Item):
                                object_id_field='object_pk')
 
     def get_absolute_url(self):
-        return self.project.get_absolute_url()
+        return reverse(
+            'project-detail',
+            kwargs=dict(
+                partner_slug=self.project.organisation.partner.slug,
+                slug=self.project.slug
+            )
+        )
 
     class Meta:
         db_table = 'meinberlin_polls_poll'

diff --git a/liqd_product/config/settings/base.py b/liqd_product/config/settings/base.py
@@ -92,6 +92,7 @@
     'liqd_product.apps.account',
     'liqd_product.apps.dashboard',
     'liqd_product.apps.embed',
+    'liqd_product.apps.exports',
     'liqd_product.apps.offlineevents',
     'liqd_product.apps.projects',