X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Furls.py;h=87cf020ec44eb86157cecbd0037fb886250fc82c;hp=c1ca5b1653a9e498fa5dad5dd5a1885ea393db1d;hb=3bb0963de83ffea3f398e18f2b1360d0ba968329;hpb=b06ae7970218f20f5a780033931533e951542299 diff --git a/portal/urls.py b/portal/urls.py index c1ca5b16..87cf020e 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -23,13 +23,13 @@ from django.views.generic.base import TemplateView from django.conf.urls import patterns, include, url -from portal.adminview import AdminView +from portal.usersview import UsersView +from portal.manageuserview import UserView, user_process from portal.platformsview import PlatformsView from portal.platformview import PlatformView from portal.resourceview import ResourceView from portal.dashboardview import DashboardView from portal.accountview import AccountView, account_process -from portal.manageuserview import UserView, user_process from portal.contactview import ContactView from portal.slicerequestview import SliceRequestView from portal.registrationview import RegistrationView @@ -60,7 +60,7 @@ urlpatterns = patterns('', url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'), #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'), url(r'^account/?$', AccountView.as_view(), name='account'), - url(r'^admin/?$', AdminView.as_view(), name='user_list'), + url(r'^users/?$', UsersView.as_view(), name='user_list'), url(r'^user/(?P[\w\s.@\-]+)/?$', UserView.as_view(), name='user'), url(r'^user/(?P[\w\s.@\-]+)/user_process/?$', user_process), url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'),