diff options
| -rw-r--r-- | packages/urls.py | 1 | ||||
| -rw-r--r-- | packages/views/display.py | 2 | ||||
| -rw-r--r-- | templates/packages/search_paginator.html | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/packages/urls.py b/packages/urls.py index 9a151b4..4e2e263 100644 --- a/packages/urls.py +++ b/packages/urls.py @@ -24,7 +24,6 @@ urlpatterns = patterns('packages.views', (r'^update/$', 'update'), (r'^$', SearchListView.as_view(), {}, 'packages-search'), - (r'^(?P<page>\d+)/$', SearchListView.as_view()), (r'^search/json/$', 'search_json'), (r'^differences/$', 'arch_differences', {}, 'packages-differences'), diff --git a/packages/views/display.py b/packages/views/display.py index 497c8d4..fcf8fde 100644 --- a/packages/views/display.py +++ b/packages/views/display.py @@ -104,6 +104,8 @@ def redirect_agnostic(request, name, repo, arch): def redirect_to_search(request, name, repo, arch): + if request.GET.get('q'): + name = request.GET.get('q') pkg_data = [ ('arch', arch.lower()), ('repo', repo.lower()), diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html index 758dca4..3c368b8 100644 --- a/templates/packages/search_paginator.html +++ b/templates/packages/search_paginator.html @@ -6,7 +6,7 @@ <div class="pkglist-nav"> <span class="prev"> {% if page_obj.has_previous %} - <a href="/packages/{{ page_obj.previous_page_number }}/?{{ current_query }}" + <a href="?page={{ page_obj.previous_page_number }}&{{ current_query }}" title="Go to previous page">< Prev</a> {% else %} < Prev @@ -14,7 +14,7 @@ </span> <span class="next"> {% if page_obj.has_next %} - <a href="/packages/{{ page_obj.next_page_number }}/?{{ current_query }}" + <a href="?page={{ page_obj.next_page_number }}&{{ current_query }}" title="Go to next page">Next ></a> {% else %} Next > |