summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorPierre-Yves Chibon <pingou@pingoured.fr>2012-04-05 07:41:20 +0200
committerPierre-Yves Chibon <pingou@pingoured.fr>2012-04-05 07:41:20 +0200
commit643b3b8241e24a2a582b2b91c45f93c9e799b7ac (patch)
treef26302dc23fb6d2ffa0289f4064a348e3f916851 /urls.py
parentb754c3085cee6212a661178c56b3abb85e96f186 (diff)
downloadhyperkitty-643b3b8241e24a2a582b2b91c45f93c9e799b7ac.tar.gz
hyperkitty-643b3b8241e24a2a582b2b91c45f93c9e799b7ac.tar.xz
hyperkitty-643b3b8241e24a2a582b2b91c45f93c9e799b7ac.zip
Fix the search to work properly with the pagination and have nice urls
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/urls.py b/urls.py
index 845474d..afa7cae 100644
--- a/urls.py
+++ b/urls.py
@@ -31,9 +31,10 @@ urlpatterns = patterns('',
url(r'^message/(?P<mlist_fqdn>.*@.*)/(?P<messageid>.+)$', 'views.pages.message'),
# Search
#url(r'^search$', 'views.pages.search'),
- url(r'^search/(?P<mlist_fqdn>.*@.*)$', 'views.pages.search_keyword'),
- url(r'^search/(?P<mlist_fqdn>.*@.*)/$', 'views.pages.search_keyword'),
- url(r'^search/(?P<mlist_fqdn>.*@.*)\/(?P<keyword>.*)$', 'views.pages.search_keyword'),
+ 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'),
+ url(r'^search/(?P<mlist_fqdn>.*@.*)$', 'views.pages.search'),
+ url(r'^search/(?P<mlist_fqdn>.*@.*)/$', 'views.pages.search'),
url(r'^tag/(?P<mlist_fqdn>.*@.*)\/(?P<tag>.*)$', 'views.pages.search_tag'),
# mockups:
url(r'^mockup/$', 'views.mockup.index'),