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, 5 insertions, 4 deletions

diff --git a/templates/patchwork/bundle.html b/templates/patchwork/bundle.html
index a2933d5..54c2fcc 100644
--- a/templates/patchwork/bundle.html
+++ b/templates/patchwork/bundle.html
@@ -14,17 +14,17 @@
   </script>
 {% endblock %}
 {% block title %}{{project.name}}{% endblock %}
-{% block heading %}bundle: {{bundle.name}}{% endblock %}
+{% block heading %}bundle: {{bundle.owner.username}} /
+{{bundle.name}}{% endblock %}
 
 {% block body %}
 
 <p>This bundle contains patches for the {{ bundle.project.linkname }}
 project.</p>
 
-<p><a href="{% url patchwork.views.bundle.mbox bundle_id=bundle.id %}"
->Download bundle as mbox</a></p>
-
+<p><a href="{% url patchwork.views.bundle.mbox username=bundle.owner.username bundlename=bundle.name %}">Download bundle as mbox</a></p>
 
+{% if bundleform %}
 <form method="post">
  {% csrf_token %}
  <input type="hidden" name="form" value="bundle"/>
@@ -45,6 +45,7 @@ project.</p>
 </form>
 
 <div style="clear: both; padding: 1em;"></div>
+{% endif %}
 
 {% include "patchwork/patch-list.html" %}