X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=c1ca5b1653a9e498fa5dad5dd5a1885ea393db1d;hb=350a118a4f8e3329f39fe7f245cb27388a3756f0;hp=43ea63946a100539c71348b2039fbbc9f937562d;hpb=a2bdf59bb10ab56ba5b48a98537fbfb51d206dd8;p=unfold.git diff --git a/portal/urls.py b/portal/urls.py index 43ea6394..c1ca5b16 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -29,6 +29,7 @@ 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 +61,8 @@ urlpatterns = patterns('', #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'^user/(?P[\w\s.@\-]+)/?$', AccountView.as_view(), name='account'), + 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'), url(r'^platform/(?P[\w\.\-]+)/?$', PlatformView.as_view(), name='platform'), url(r'^resource/(?P[\w\.\-\+\:]+)/?$', ResourceView.as_view(), name='resource'),