From c63d0f755feb49b79506777228ffc88a7c934f23 Mon Sep 17 00:00:00 2001
From: Aamir Khan <syst3m.w0rm@gmail.com>
Date: Thu, 5 Apr 2012 23:10:37 +0530
Subject: Fix next and previous links on search page

---
 templates/search.html | 8 ++++----
 urls.py               | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/search.html b/templates/search.html
index f2fa699..5e8f847 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -21,7 +21,7 @@
     <div class="pagination">
       <span class="step-links">
         {% if threads.has_previous %}
-        <a href="?page={{ threads.previous_page_number }}">previous</a>
+        <a href="{{ threads.previous_page_number }}">previous</a>
         {% endif %}
 
         <span class="current">
@@ -29,7 +29,7 @@
         </span>
 
         {% if threads.has_next %}
-            <a href="?page={{ threads.next_page_number }}">next</a>
+            <a href="{{ threads.next_page_number }}">next</a>
         {% endif %}
       </span>
     </div>
@@ -98,7 +98,7 @@
     <div class="pagination">
       <span class="step-links">
         {% if threads.has_previous %}
-          <a href="?page={{ threads.previous_page_number }}">previous</a>
+          <a href="{{ threads.previous_page_number }}">previous</a>
         {% endif %}
 
         <span class="current">
@@ -106,7 +106,7 @@
         </span>
 
         {% if threads.has_next %}
-          <a href="?page={{ threads.next_page_number }}">next</a>
+          <a href="{{ threads.next_page_number }}">next</a>
         {% endif %}
       </span>
     </div>
diff --git a/urls.py b/urls.py
index e2d7f9e..22ce246 100644
--- a/urls.py
+++ b/urls.py
@@ -32,8 +32,8 @@ urlpatterns = patterns('',
     # Search
     #url(r'^search$', 'views.pages.search'),
     # If page number is present in URL
-    url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)\/(?P<page>.*)$', 'views.pages.search_keyword'),
-    url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)\/(?P<page>.*)/$', 'views.pages.search_keyword'),
+    url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)\/(?P<page>\d)$', 'views.pages.search_keyword'),
+    url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)\/(?P<page>\d)/$', 'views.pages.search_keyword'),
     # Show the first page as default when no page number is present in URL
     url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)$', 'views.pages.search_keyword'),
     url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<target>.*)\/(?P<keyword>.*)/$', 'views.pages.search_keyword'),
-- 
cgit