bundles: Remove separate public bundle views

Having two views for bundles (public and non-public) can cause confusion
when bundle owners want to share a URL; it's not obvious that the
private URL isn't shareable.

This change removes the private URLs, and puts all bundles under the
/bundle/<username>/<bundlename>/ URL space. For non-public bundles, this
will just 404 for non-owners.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index 86a5266..9129aab 100644
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -363,12 +363,19 @@ class Bundle(models.Model):
             return None
         site = Site.objects.get_current()
         return 'http://%s%s' % (site.domain,
-                reverse('patchwork.views.bundle.public',
+                reverse('patchwork.views.bundle.bundle',
                         kwargs = {
                                 'username': self.owner.username,
                                 'bundlename': self.name
                         }))
 
+    @models.permalink
+    def get_absolute_url(self):
+        return ('patchwork.views.bundle.bundle', (), {
+                                'username': self.owner.username,
+                                'bundlename': self.name,
+                            })
+
     def mbox(self):
         return '\n'.join([p.mbox().as_string(True)
                         for p in self.ordered_patches()])