From 9b1ab20d0acbc8c336fa86bc74c389107d67dda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Mon, 30 Sep 2013 17:54:36 +0200
Subject: [PATCH] Smallfix: Fixed some problems with Routers

---
 greenmine/base/routers.py | 16 +++++++++++++---
 greenmine/base/urls.py    | 10 ++++------
 greenmine/scrum/urls.py   |  2 +-
 greenmine/urls.py         | 12 ++++++------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/greenmine/base/routers.py b/greenmine/base/routers.py
index 0352feee..69e94af4 100644
--- a/greenmine/base/routers.py
+++ b/greenmine/base/routers.py
@@ -9,12 +9,22 @@ actions_router = routers.Route(url=r'^{prefix}/{methodname}{trailing_slash}$',
                                initkwargs={})
 
 
-class Router(routers.DefaultRouter):
+class DefaultRouter(routers.DefaultRouter):
     routes = [
         routers.DefaultRouter.routes[0],
         actions_router,
         routers.DefaultRouter.routes[2],
-        routers.DefaultRouter.routes[1]]
+        routers.DefaultRouter.routes[1]
+    ]
 
 
-__all__ = ["Router"]
+class SimpleRouter(routers.SimpleRouter):
+    routes = [
+        routers.SimpleRouter.routes[0],
+        actions_router,
+        routers.SimpleRouter.routes[2],
+        routers.SimpleRouter.routes[1]
+    ]
+
+
+__all__ = ["DefaultRouter", "SimpleRouter"]
diff --git a/greenmine/base/urls.py b/greenmine/base/urls.py
index 7282c0e4..5f163b1d 100644
--- a/greenmine/base/urls.py
+++ b/greenmine/base/urls.py
@@ -1,15 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import patterns, url, include
-from greenmine.base import api, routers
+from . import api, routers
 
-router = routers.Router(trailing_slash=False)
+
+router = routers.SimpleRouter(trailing_slash=False)
 router.register(r"users", api.UsersViewSet, base_name="users")
 router.register(r"roles", api.RolesViewSet, base_name="roles")
 router.register(r"search", api.Search, base_name="search")
 router.register(r"auth/login", api.Login, base_name="auth-login")
 router.register(r"auth/logout", api.Logout, base_name="auth-logout")
 
-urlpatterns = patterns("",
-    url(r"", include(router.urls)),
-)
+urlpatterns = router.urls
diff --git a/greenmine/scrum/urls.py b/greenmine/scrum/urls.py
index 3b897f65..6bf80715 100644
--- a/greenmine/scrum/urls.py
+++ b/greenmine/scrum/urls.py
@@ -7,7 +7,7 @@ from greenmine.scrum import api
 from greenmine.base import routers
 
 
-router = routers.Router(trailing_slash=False)
+router = routers.DefaultRouter(trailing_slash=False)
 router.register(r"projects", api.ProjectViewSet, base_name="projects")
 router.register(r"milestones", api.MilestoneViewSet, base_name="milestones")
 router.register(r"userstories", api.UserStoryViewSet, base_name="userstories")
diff --git a/greenmine/urls.py b/greenmine/urls.py
index 9b20c444..e8c865d2 100644
--- a/greenmine/urls.py
+++ b/greenmine/urls.py
@@ -9,12 +9,12 @@ from greenmine.base.api import ApiRoot
 
 
 urlpatterns = patterns('',
-    url(r'^api/v1/core/', include('greenmine.base.urls')),
-    url(r'^api/v1/scrum/', include('greenmine.scrum.urls')),
-    url(r'^api/v1/documents/', include('greenmine.documents.urls')),
-    url(r'^api/v1/questions/', include('greenmine.questions.urls')),
-    url(r'^api/v1/wiki/', include('greenmine.wiki.urls')),
-    url(r'^api/v1$', ApiRoot.as_view()),
+    url(r'^api/v1/', include('greenmine.base.urls')),
+    url(r'^api/v1/', include('greenmine.scrum.urls')),
+    url(r'^api/v1/', include('greenmine.wiki.urls')),
+    # TODO: Finish the documents and questions app
+    #url(r'^api/v1/', include('greenmine.questions.urls')),
+    #url(r'^api/v1/', include('greenmine.documents.urls')),
 
     url(r'^admin/', include(admin.site.urls)),
     url(r'^grappelli/', include('grappelli.urls')),