fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
403 message
[edumed.git]
/
edumed
/
urls.py
diff --git
a/edumed/urls.py
b/edumed/urls.py
index
0e5c295
..
0bc3091
100644
(file)
--- a/
edumed/urls.py
+++ b/
edumed/urls.py
@@
-53,6
+53,12
@@
if 'django_cas' in settings.INSTALLED_APPS:
url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
)
url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
)
+else:
+ from django.contrib.auth.views import login, logout
+ urlpatterns += (
+ url(r'^accounts/login/$', login, name='login'),
+ url(r'^accounts/logout/$', logout, name='logout'),
+ )
urlpatterns += (
url(r'^(?P<url>[^/]*/|)$',
urlpatterns += (
url(r'^(?P<url>[^/]*/|)$',
@@
-60,8
+66,7
@@
urlpatterns += (
)
if settings.DEBUG:
)
if settings.DEBUG:
- urlpatterns += patterns(
- '',
+ urlpatterns += (
# 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,
# }),