# HG changeset patch # User rougeronj # Date 1427215462 -3600 # Node ID cf8c306ab902ca8c5bc883223dc22fb9a7e57402 # Parent 667386d6b742dadbd1e2cf4841c7cedeca597418 moove authentication urls inside ammico urls diff -r 667386d6b742 -r cf8c306ab902 server/ammico/urls.py --- a/server/ammico/urls.py Tue Mar 24 17:43:55 2015 +0100 +++ b/server/ammico/urls.py Tue Mar 24 17:44:22 2015 +0100 @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url +from django.conf.urls import patterns, url, include from ammico.views import populateUser, ListBooks, InfoBook, ListSlides, InfoSlide, GetSlides @@ -10,4 +10,5 @@ url(r'^books/(?P[0-9]+)/slides$', GetSlides.as_view()), url(r'^slides/$', ListSlides.as_view()), url(r'^slides/(?P[0-9]+)$', InfoSlide.as_view()), + url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), ) diff -r 667386d6b742 -r cf8c306ab902 server/urls.py --- a/server/urls.py Tue Mar 24 17:43:55 2015 +0100 +++ b/server/urls.py Tue Mar 24 17:44:22 2015 +0100 @@ -5,6 +5,5 @@ urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), - url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), url(r'^ammico/', include('ammico.urls')), ) \ No newline at end of file