taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Smallfix: Fixed some problems with Routers

remotes/origin/enhancement/email-actions
David Barragán Merino 2013-09-30 17:54:36 +02:00
parent 09b1de6196
commit 9b1ab20d0a
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
greenmine/base/routers.py
View File

@ -9,12 +9,22 @@ actions_router = routers.Route(url=r'^{prefix}/{methodname}{trailing_slash}$',
initkwargs={}) initkwargs={})
class Router(routers.DefaultRouter): class DefaultRouter(routers.DefaultRouter):
routes = [ routes = [
routers.DefaultRouter.routes[0], routers.DefaultRouter.routes[0],
actions_router, actions_router,
routers.DefaultRouter.routes[2], 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"]

10
greenmine/base/urls.py
View File

@ -1,15 +1,13 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf.urls import patterns, url, include from . import api, routers
from greenmine.base 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"users", api.UsersViewSet, base_name="users")
router.register(r"roles", api.RolesViewSet, base_name="roles") router.register(r"roles", api.RolesViewSet, base_name="roles")
router.register(r"search", api.Search, base_name="search") router.register(r"search", api.Search, base_name="search")
router.register(r"auth/login", api.Login, base_name="auth-login") router.register(r"auth/login", api.Login, base_name="auth-login")
router.register(r"auth/logout", api.Logout, base_name="auth-logout") router.register(r"auth/logout", api.Logout, base_name="auth-logout")
urlpatterns = patterns("", urlpatterns = router.urls
url(r"", include(router.urls)),
)

2
greenmine/scrum/urls.py
View File

@ -7,7 +7,7 @@ from greenmine.scrum import api
from greenmine.base import routers 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"projects", api.ProjectViewSet, base_name="projects")
router.register(r"milestones", api.MilestoneViewSet, base_name="milestones") router.register(r"milestones", api.MilestoneViewSet, base_name="milestones")
router.register(r"userstories", api.UserStoryViewSet, base_name="userstories") router.register(r"userstories", api.UserStoryViewSet, base_name="userstories")

12
greenmine/urls.py
View File

@ -9,12 +9,12 @@ from greenmine.base.api import ApiRoot
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^api/v1/core/', include('greenmine.base.urls')), url(r'^api/v1/', include('greenmine.base.urls')),
url(r'^api/v1/scrum/', include('greenmine.scrum.urls')), url(r'^api/v1/', include('greenmine.scrum.urls')),
url(r'^api/v1/documents/', include('greenmine.documents.urls')), url(r'^api/v1/', include('greenmine.wiki.urls')),
url(r'^api/v1/questions/', include('greenmine.questions.urls')), # TODO: Finish the documents and questions app
url(r'^api/v1/wiki/', include('greenmine.wiki.urls')), #url(r'^api/v1/', include('greenmine.questions.urls')),
url(r'^api/v1$', ApiRoot.as_view()), #url(r'^api/v1/', include('greenmine.documents.urls')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^grappelli/', include('grappelli.urls')), url(r'^grappelli/', include('grappelli.urls')),