fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing links to competencies catalogue in a lesson view
[edumed.git]
/
edumed
/
milurls.py
diff --git
a/edumed/milurls.py
b/edumed/milurls.py
index
0fe0f5d
..
3ad16c7
100644
(file)
--- a/
edumed/milurls.py
+++ b/
edumed/milurls.py
@@
-1,7
+1,7
@@
from django.conf.urls import include, url, patterns
from fnpdjango.utils.urls import i18n_patterns
from django.conf.urls import include, url, patterns
from fnpdjango.utils.urls import i18n_patterns
-from .views import mil_home_view
+from .views import mil_home_view
, mil_contact_view
urlpatterns = i18n_patterns('',
urlpatterns = i18n_patterns('',
@@
-9,8
+9,15
@@
urlpatterns = i18n_patterns('',
url(r'^kompetencje/', include('curriculum.urls')),
url(r'^wez-udzial/', include('comment.urls')),
url(r'^zglos/', include('contact.urls')),
url(r'^kompetencje/', include('curriculum.urls')),
url(r'^wez-udzial/', include('comment.urls')),
url(r'^zglos/', include('contact.urls')),
+ url(r'^kontakt/$', mil_contact_view, name='mil_contact')
)
handler404 = 'edumed.views.mil_404_view'
)
handler404 = 'edumed.views.mil_404_view'
-
+from django.conf import settings
+if settings.DEBUG:
+ urlpatterns += patterns('',
+ url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+ 'document_root': settings.MEDIA_ROOT,
+ }),
+ )