In 'd1c605f', we reworked the 'bundle-list' view to use the new 'Bundle.get_mbox_url' function instead of the 'Bundle.public_url'. However, these are not the same thing. The latter referred to the 'bundle-detail' view, while the former referred to the 'bundle-mbox' view.
The easiest fix would be to simply revert that patch. However, it turns out that 'public_url' isn't actually needed. Commit '5d0140ef' removed a divide between public and non-public URLs for bundles, meaning we can actually use an existing function - 'get_absolute_url' - instead. This also presents the opportunity to clean up the 'bundle-list' page, favouring a simple public/is-not-public marker and only a single URL. Signed-off-by: Stephen Finucane <[email protected]> Fixes: d1c605f9 ("views: Stop using Bundle.public_url") Closes-bug: #92 Cc: Daniel Axtens <[email protected]> Cc: Andy Doan <[email protected]> --- patchwork/templates/patchwork/bundles.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/patchwork/templates/patchwork/bundles.html b/patchwork/templates/patchwork/bundles.html index 9e225ea..61a13ea 100644 --- a/patchwork/templates/patchwork/bundles.html +++ b/patchwork/templates/patchwork/bundles.html @@ -11,9 +11,9 @@ {% if bundles %} <table class="bundlelist"> <tr> - <th>Name</th> + <th>Bundle</th> <th>Project</th> - <th>Public Link</th> + <th>Public</th> <th>Patches</td> <th>Download</th> <th>Delete</th> @@ -22,9 +22,11 @@ <tr> <td><a href="{{ bundle.get_absolute_url }}">{{ bundle.name }}</a></td> <td>{{ bundle.project.linkname }}</td> - <td> + <td style="text-align: center;"> {% if bundle.public %} - <a href="{{ bundle.get_mbox_url }}">{{ bundle.get_mbox_url }}</a> + <span class="glyphicon glyphicon-ok"></span> + {% else %} + <span class="glyphicon glyphicon-remove"></span> {% endif %} </td> <td style="text-align: right">{{ bundle.patches.count }}</td> -- 2.9.3 _______________________________________________ Patchwork mailing list [email protected] https://lists.ozlabs.org/listinfo/patchwork
