diff options
author | Pierre-Yves Chibon <pingou@pingoured.fr> | 2012-03-31 16:23:01 +0200 |
---|---|---|
committer | Pierre-Yves Chibon <pingou@pingoured.fr> | 2012-03-31 16:23:01 +0200 |
commit | da61e8b5a39d246e3f7535165cbfb54c997bef37 (patch) | |
tree | 04ff99517e2826637be719de46c51326490bb705 /urls.py | |
parent | 9f729a6c8fa5fbbe16f04c44dee360d0fbd5226b (diff) | |
parent | 85d040687fc21f13f3a124eb88f154027e052da1 (diff) | |
download | hyperkitty-da61e8b5a39d246e3f7535165cbfb54c997bef37.tar.gz hyperkitty-da61e8b5a39d246e3f7535165cbfb54c997bef37.tar.xz hyperkitty-da61e8b5a39d246e3f7535165cbfb54c997bef37.zip |
Merge
Diffstat (limited to 'urls.py')
-rw-r--r-- | urls.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,6 +1,6 @@ from django.conf.urls.defaults import patterns, include, url from django.conf import settings -from api import EmailResource, ThreadResource +from api import EmailResource, ThreadResource, SearchResource from django.contrib.staticfiles.urls import staticfiles_urlpatterns @@ -46,6 +46,7 @@ urlpatterns = patterns('', url(r'^api/$', 'views.pages.api'), url(r'^api/email\/(?P<mlist_fqdn>.*@.*)\/(?P<messageid>.*)/', EmailResource.as_view()), url(r'^api/thread\/(?P<mlist_fqdn>.*@.*)\/(?P<threadid>.*)/', ThreadResource.as_view()), + url(r'^api/search\/(?P<mlist_fqdn>.*@.*)\/(?P<field>.*)\/(?P<keyword>.*)/', SearchResource.as_view()), # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), |