matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development' into lokeshmanmode/mayan-edms-master

Browse Source
This commit is contained in:
Roberto Rosario
2017-01-15 01:51:02 -04:00
parent 863c435bf5 5fafbd5e7a
commit 0ddd766dfa
819 changed files with 82406 additions and 11484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mayan/apps/permissions/urls.py
View File

@@ -1,6 +1,6 @@
from __future__ import unicode_literals
from django.conf.urls import patterns, url
from django.conf.urls import url
from .api_views import APIRoleListView, APIRoleView, APIMapRolePerms,\
APIMapRoleGroups, APIGetPermission, APIDeleteRoleGroups
@@ -9,8 +9,7 @@ from .views import (
SetupRoleMembersView, SetupRolePermissionsView
)
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^role/list/$', RoleListView.as_view(), name='role_list'),
url(r'^role/create/$', RoleCreateView.as_view(), name='role_create'),
url(
@@ -26,17 +25,17 @@ urlpatterns = patterns(
r'^role/(?P<pk>\d+)/members/$', SetupRoleMembersView.as_view(),
name='role_members'
),
)
]
api_urls = patterns(
api_urls = [
url(r'^roles/$', APIRoleListView.as_view(), name='role-list'),
url(r'^roles/(?P<pk>[0-9]+)/$', APIRoleView.as_view(), name='role-detail'),
url(r'^roles/(?P<pk>[0-9]+)/permissions/$', APIMapRolePerms.as_view(),
url(r'^roles/(?P<pk>[0-9]+)/permissions/$', APIMapRolePerms.as_view(),
name='role-permissions-map'),
url(r'^roles/(?P<pk>[0-9]+)/groups/$', APIMapRoleGroups.as_view(),
url(r'^roles/(?P<pk>[0-9]+)/groups/$', APIMapRoleGroups.as_view(),
name='map-role-groups'),
url(r'^roles/(?P<role_pk>[0-9]+)/groups/(?P<group_pk>[0-9]+)/$', APIDeleteRoleGroups.as_view(),
url(r'^roles/(?P<role_pk>[0-9]+)/groups/(?P<group_pk>[0-9]+)/$', APIDeleteRoleGroups.as_view(),
name='delete-role-groups'),
url(r'^$', APIGetPermission.as_view(),
url(r'^$', APIGetPermission.as_view(),
name='role-permissions'),
)
]