diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2012-11-15 12:22:42 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2012-11-15 12:22:42 +0100 |
| commit | 44d800673637b43c075c05d7c0a9d229fdb47b9c (patch) | |
| tree | 0ca644e93aaedfe5ca78ae4bfad669e2bc675663 | |
| parent | da573d9e2ff66d30d3a06c2641a828ae8b272e7d (diff) | |
| download | hyperkitty-44d800673637b43c075c05d7c0a9d229fdb47b9c.tar.gz hyperkitty-44d800673637b43c075c05d7c0a9d229fdb47b9c.tar.xz hyperkitty-44d800673637b43c075c05d7c0a9d229fdb47b9c.zip | |
Use Django's reverse() method for crafting URLs
| -rw-r--r-- | hyperkitty/urls.py | 4 | ||||
| -rw-r--r-- | hyperkitty/views/list.py | 8 |
2 files changed, 8 insertions, 4 deletions
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) |