Merge branch 'master' of github.com:fnp/prawokultury

[prawokultury.git] / prawokultury / urls.py

diff --git a/prawokultury/urls.py b/prawokultury/urls.py
index 6da0510..4db309c 100644 (file)
--- a/prawokultury/urls.py
+++ b/prawokultury/urls.py
@@ -9,7 +9,7 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from migdal.helpers import i18n_patterns
 from migdal.urls import urlpatterns as migdal_urlpatterns
 from django.utils.translation import ugettext_lazy as _, string_concat
 from migdal.helpers import i18n_patterns
 from migdal.urls import urlpatterns as migdal_urlpatterns
 from django.utils.translation import ugettext_lazy as _, string_concat

-
+from events.urls import urlpatterns as events_urlpatterns

 
 admin.autodiscover()
 
 
 admin.autodiscover()
 


@@ -19,11 +19,16 @@ urlpatterns = patterns('',
     url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
             'document_root': settings.MEDIA_ROOT,
         }),
     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')),
 ) + i18n_patterns('',
     url(string_concat(r'^', _('events'), r'/'), include('events.urls')),
     url(r'^comments/', include('django_comments_xtd.urls')),

-) + migdal_urlpatterns
+) + migdal_urlpatterns 

 
 

+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )

 
 urlpatterns += staticfiles_urlpatterns()
 
 urlpatterns += staticfiles_urlpatterns()