From: Yasin Date: Thu, 13 Feb 2014 15:21:35 +0000 (+0100) Subject: Admin: URL Dispatcher added X-Git-Tag: myslice-1.1~336^2~2 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=a2bdf59bb10ab56ba5b48a98537fbfb51d206dd8 Admin: URL Dispatcher added --- diff --git a/portal/templates/adminview.html b/portal/templates/adminview.html index 71ecc81e..1af964ff 100644 --- a/portal/templates/adminview.html +++ b/portal/templates/adminview.html @@ -25,7 +25,6 @@ {{ user.email }} {{ user.authority }} {{ user.status }} - {%endfor%} diff --git a/portal/urls.py b/portal/urls.py index 8e7f2861..43ea6394 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -59,7 +59,8 @@ 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='admin'), + url(r'^admin/?$', AdminView.as_view(), name='user_list'), + url(r'^user/(?P[\w\s.@\-]+)/?$', AccountView.as_view(), name='account'), 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'),