From: Kaltar5679 <killian.mary@outlook.fr>
Date: Fri, 24 Apr 2015 08:02:25 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~84
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=959007ba3e1bc443509e1dcbb08ca830e89e653e;p=telemeta.git

Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack

Conflicts:
	telemeta/haystack_urls.py
---

959007ba3e1bc443509e1dcbb08ca830e89e653e
diff --cc telemeta/haystack_urls.py
index 32bee44d,35f0a272..bcd83e44
--- a/telemeta/haystack_urls.py
+++ b/telemeta/haystack_urls.py
@@@ -1,14 -1,11 +1,13 @@@
  # -*- coding: utf-8 -*-
  from django.conf.urls import patterns, url, include
  from telemeta.views.haystack_search import *
- from haystack.query import SearchQuerySet
- from haystack.views import SearchView
  from haystack.forms import *
 +from telemeta.forms.haystack_form import HaySearchFormItem, HaySearchFormCollection, HayAdvanceSearchForm
 +
  
+ 
  urlpatterns = patterns('',
      url(r'^$', HaystackSearch(form_class=HaySearchFormItem), name='haystack_search'),
-     url(r'^(?P<type>[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'),
 +    url(r'^advance/$', HaystackAdvanceSearch(form_class=HayAdvanceSearchForm), name='haystack_search_advance'),
+     url(r'^quick/(?P<type>[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'),
 -
  )