Mercurial Mercurial > ammico / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moove authentication urls inside ammico urls
authorrougeronj
Tue, 24 Mar 2015 17:44:22 +0100
changeset 35 cf8c306ab902
parent 34 667386d6b742
child 36 160c3d2633f4
moove authentication urls inside ammico urls
server/ammico/urls.py file | annotate | diff | comparison | revisions
server/urls.py file | annotate | diff | comparison | revisions 
--- 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<idBook>[0-9]+)/slides$', GetSlides.as_view()),
     url(r'^slides/$', ListSlides.as_view()),
     url(r'^slides/(?P<idSlide>[0-9]+)$', InfoSlide.as_view()),
+    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 )
--- 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
ammico