maxscore

[edumed.git] / edumed / urls.py

diff --git a/edumed/urls.py b/edumed/urls.py
index 77b9872..5978ddf 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -12,6 +12,7 @@ urlpatterns = patterns('',
 #    url(r'^i/', include('django.contrib.flatpages.urls')),
     url(r'^i/(?P<url>.*)$', 'django.contrib.flatpages.views.flatpage',
         name="info"),
 #    url(r'^i/', include('django.contrib.flatpages.urls')),
     url(r'^i/(?P<url>.*)$', 'django.contrib.flatpages.views.flatpage',
         name="info"),

+    url(r'^szukaj/', include('haystack.urls')),

 )
 
 
 )
 
 


@@ -31,3 +32,11 @@ if 'django_cas' in settings.INSTALLED_APPS:
         (r'^accounts/login/$', 'django_cas.views.login'),
         (r'^accounts/logout/$', 'django_cas.views.logout'),
     )
         (r'^accounts/login/$', 'django_cas.views.login'),
         (r'^accounts/logout/$', 'django_cas.views.logout'),
     )

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