X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=763678e0a0b84f40a35a094501a4e4fc5eb30a3f;hb=24efb592d00c990dbf065ac00dc60f738425deac;hp=2d870d536330ec286d884605f6059f9525804772;hpb=b9a4e61ff89fea70d31a96e3f8238150fc5201bd;p=myslice.git diff --git a/portal/urls.py b/portal/urls.py index 2d870d53..763678e0 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -20,10 +20,11 @@ # this program; see the file COPYING. If not, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from django.conf.urls import patterns, include, url -from portal import views -from portal.views import DashboardView, PresViewView, PlatformsView, PlatformView, ValidatePendingView # UserRegisterView, UserValidateView -from portal.util import TemplateView +from django.conf.urls import patterns, include, url +from portal import views +from portal.views import PresViewView, PlatformsView, PlatformView, ValidatePendingView, AccountView # UserRegisterView, UserValidateView +from portal.dashboardview import DashboardView +from portal.util import TemplateView # DEPRECATED #named_register_forms = ( # DEPRECATED # ("step1", RegisterUserForm), @@ -43,7 +44,7 @@ urlpatterns = patterns('', #url(r'^user/validate/?$', UserValidateView.as_view(), name='user_validate'), url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'), #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'), - url(r'^account/?$', views.my_account), + url(r'^account/?$', AccountView.as_view(), name='account'), url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'), #url(r'^portal/platform/?$', PlatformView.platform_view(), name='platform'), url(r'^platform/(?P[\w\.]+)/?$', PlatformView.as_view(), name='platform'), @@ -55,6 +56,9 @@ urlpatterns = patterns('', url(r'^slice_request/?$', views.slice_request), # Validate pending requests url(r'^validate/?$', ValidatePendingView.as_view()), + # http://stackoverflow.com/questions/2360179/django-urls-how-to-pass-a-list-of-items-via-clean-urls + # (r'^validate_action/(?P[^/]+)/(?P\w+)/?$', 'portal.views.pres_view_static'), + (r'^validate_action(?P(?:/\w+)+)/?$', 'portal.actions.validate_action'), url(r'^pres_view/?$', PresViewView.as_view(), name='pres_view'), (r'^methods/(?P\w+)/?$', 'portal.views.pres_view_methods'),