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

mayan/apps/user_management/urls.py

@@ -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 (
     APICurrentUserView, APIGroupListView, APIGroupView, APIUserListView,
@@ -8,11 +8,11 @@ from .api_views import (
 )
 from .views import (
     GroupCreateView, GroupDeleteView, GroupEditView, GroupListView,
-    GroupMembersView, UserEditView, UserGroupsView, UserListView
+    GroupMembersView, UserCreateView, UserDeleteView, UserEditView,
+    UserGroupsView, UserListView, UserSetPasswordView
 )
 
-urlpatterns = patterns(
-    'user_management.views',
+urlpatterns = [
     url(r'^group/list/$', GroupListView.as_view(), name='group_list'),
     url(r'^group/add/$', GroupCreateView.as_view(), name='group_add'),
     url(
@@ -29,29 +29,31 @@ urlpatterns = patterns(
     ),
 
     url(r'^user/list/$', UserListView.as_view(), name='user_list'),
-    url(r'^user/add/$', 'user_add', name='user_add'),
+    url(r'^user/add/$', UserCreateView.as_view(), name='user_add'),
     url(r'^user/(?P<pk>\d+)/edit/$', UserEditView.as_view(), name='user_edit'),
-    url(r'^user/(?P<user_id>\d+)/delete/$', 'user_delete', name='user_delete'),
     url(
-        r'^user/multiple/delete/$', 'user_multiple_delete',
+        r'^user/(?P<pk>\d+)/delete/$', UserDeleteView.as_view(),
+        name='user_delete'
+    ),
+    url(
+        r'^user/multiple/delete/$', UserDeleteView.as_view(),
         name='user_multiple_delete'
     ),
     url(
-        r'^user/(?P<user_id>\d+)/set_password/$', 'user_set_password',
+        r'^user/(?P<pk>\d+)/set_password/$', UserSetPasswordView.as_view(),
         name='user_set_password'
     ),
     url(
-        r'^user/multiple/set_password/$', 'user_multiple_set_password',
+        r'^user/multiple/set_password/$', UserSetPasswordView.as_view(),
         name='user_multiple_set_password'
     ),
     url(
         r'^user/(?P<pk>\d+)/groups/$', UserGroupsView.as_view(),
         name='user_groups'
     ),
-)
+]
 
-api_urls = patterns(
-    '',
+api_urls = [
     url(r'^groups/$', APIGroupListView.as_view(), name='group-list'),
     url(
         r'^groups/(?P<pk>[0-9]+)/$', APIGroupView.as_view(),
@@ -64,4 +66,4 @@ api_urls = patterns(
     ),
     url(r'^users/(?P<pk>[0-9]+)/groups/$',APIUserGroupMap.as_view(),
                                         name='users-group-map'),
-)
+]