summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-07 21:50:13 -0600
committerDan McGee <dan@archlinux.org>2011-03-07 21:50:13 -0600
commit6a429a8d898d5f0789f5b5a3f2858c6578fa5227 (patch)
tree017e857cb1d5ab8838699ca1d37de576e25285e9 /templates
parente82a4d5b9c17fbc5ee63d14a1c87ef12718fa343 (diff)
downloadarchweb-6a429a8d898d5f0789f5b5a3f2858c6578fa5227.tar.gz
archweb-6a429a8d898d5f0789f5b5a3f2858c6578fa5227.zip
Clean up current_query and preserve multiple args
When implementing search for multiple architectures or repositories, I didn't update this method to accomidate the new query parameters. Clean it up a bit by not appending/stripping the leading '?' anywhere but in the template itself, and ensure we can handle multiple of any parameter passed in. Fixes FS#23180. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'templates')
-rw-r--r--templates/packages/search.html18
1 files changed, 9 insertions, 9 deletions
diff --git a/templates/packages/search.html b/templates/packages/search.html
index dad05ffa..5d0de1f4 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -50,13 +50,13 @@
<p class="pkglist-nav">
{% if page_obj.has_previous %}
- <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+ <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
title="Go to previous page">&lt; Prev</a>
{% else %}
<span class="prev">&lt; Prev</span>
{% endif %}
{% if page_obj.has_next %}
- <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+ <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
title="Go to next page">Next &gt;</a>
{% else %}
<span class="next">Next &gt;</span>
@@ -74,17 +74,17 @@
{% if perms.main.change_package %}
<th>&nbsp;</th>
{% endif %}
- <th><a href="/packages/{% buildsortqs "arch" %}"
+ <th><a href="/packages/?{% buildsortqs "arch" %}"
title="Sort packages by architecture">Arch</a></th>
- <th><a href="/packages/{% buildsortqs "repo" %}"
+ <th><a href="/packages/?{% buildsortqs "repo" %}"
title="Sort packages by repository">Repo</a></th>
- <th><a href="/packages/{% buildsortqs "pkgname" %}"
+ <th><a href="/packages/?{% buildsortqs "pkgname" %}"
title="Sort packages by package name">Name</a></th>
<th>Version</th>
<th>Description</th>
- <th><a href="/packages/{% buildsortqs "-last_update" %}"
+ <th><a href="/packages/?{% buildsortqs "-last_update" %}"
title="Sort packages by last update">Last Updated</a></th>
- <th><a href="/packages/{% buildsortqs "-flag_date" %}"
+ <th><a href="/packages/?{% buildsortqs "-flag_date" %}"
title="Sort packages by when marked-out of-date">Flag Date</a></th>
</tr>
</thead>
@@ -118,13 +118,13 @@
<p class="pkglist-nav">
{% if page_obj.has_previous %}
- <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+ <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
title="Go to previous page">&lt; Prev</a>
{% else %}
<span class="prev">&lt; Prev</span>
{% endif %}
{% if page_obj.has_next %}
- <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+ <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
title="Go to next page">Next &gt;</a>
{% else %}
<span class="next">Next &gt;</span>