Merge branch 'master' into search

[prawokultury.git] / prawokultury / urls.py

diff --git a/prawokultury/urls.py b/prawokultury/urls.py
index f074158..436cb0e 100644 (file)
--- a/prawokultury/urls.py
+++ b/prawokultury/urls.py
@@ -19,10 +19,17 @@ urlpatterns = patterns('',
     url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
             'document_root': settings.MEDIA_ROOT,
         }),
+    url(r'^search/', include('haystack.urls')),
 ) + i18n_patterns('',
     url(string_concat(r'^', _('events'), r'/'), include('events.urls')),
     url(r'^comments/', include('django_comments_xtd.urls')),
 ) + migdal_urlpatterns
 
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )
 
-urlpatterns += staticfiles_urlpatterns()
\ No newline at end of file
+urlpatterns += staticfiles_urlpatterns()