From 44d800673637b43c075c05d7c0a9d229fdb47b9c Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Thu, 15 Nov 2012 12:22:42 +0100
Subject: Use Django's reverse() method for crafting URLs

---
 hyperkitty/urls.py       | 4 ++--
 hyperkitty/views/list.py | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'hyperkitty')

diff --git a/hyperkitty/urls.py b/hyperkitty/urls.py
index ab2719e..3340971 100644
--- a/hyperkitty/urls.py
+++ b/hyperkitty/urls.py
@@ -51,9 +51,9 @@ urlpatterns = patterns('hyperkitty.views',
         'list.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>.*)/$',
-        'list.search_keyword'),
+        'list.search_keyword', name="search_keyword"),
     url(r'^search/(?P<mlist_fqdn>.*@.*)/$',
-        'list.search'),
+        'list.search', name="search_list"),
 
 
     ### MESSAGE LEVEL VIEWS ###
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index e17b346..b1d4b29 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -30,6 +30,7 @@ import django.utils.simplejson as simplejson
 from django.http import HttpResponse, HttpResponseRedirect
 from django.template import RequestContext, loader
 from django.conf import settings
+from django.core.urlresolvers import reverse
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, InvalidPage
 from django.contrib.auth.decorators import (login_required,
                                             permission_required,
@@ -311,11 +312,14 @@ def search(request, mlist_fqdn):
     target = request.GET.get('target')
     page = request.GET.get('page')
     if keyword and target:
-        url = '/search/%s/%s/%s/' % (mlist_fqdn, target, keyword)
+        url = reverse('search_keyword',
+                      kwargs={'mlist_fqdn': mlist_fqdn,
+                              'target': target,
+                              'keyword': keyword})
         if page:
             url += '%s/' % page
     else:
-        url = '/search/%s' % (mlist_fqdn)
+        url = reverse('search_list', kwargs={"mlist_fqdn": mlist_fqdn})
     return HttpResponseRedirect(url)
 
 
-- 
cgit