git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed case if a user has an account with an empty config field
[unfold.git]
/
myslice
/
urls.py
diff --git
a/myslice/urls.py
b/myslice/urls.py
index
1eac188
..
68d3a94
100644
(file)
--- a/
myslice/urls.py
+++ b/
myslice/urls.py
@@
-20,6
+20,10
@@
home_view=portal.homeview.HomeView.as_view()
dashboard_view=portal.dashboardview.DashboardView.as_view()
platforms_view=portal.platformsview.PlatformsView.as_view()
dashboard_view=portal.dashboardview.DashboardView.as_view()
platforms_view=portal.platformsview.PlatformsView.as_view()
+import portal.testbedlist
+import portal.sliceview
+
+
#### high level choices
# main entry point (set to the / URL)
# beware that if this view is broken you end up in an endless cycle...
#### high level choices
# main entry point (set to the / URL)
# beware that if this view is broken you end up in an endless cycle...
@@
-53,20
+57,22
@@
urls = [
(r'^logout/?$', 'auth.views.logout_user'),
#
# the manifold proxy
(r'^logout/?$', 'auth.views.logout_user'),
#
# the manifold proxy
- (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifold.manifoldproxy.proxy'),
+ (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifold
api
.manifoldproxy.proxy'),
#
#
# RESTful interface
(r'^rest/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
#
#
# RESTful interface
(r'^rest/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
+ (r'^table/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
(r'^datatable/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
#
#
#(r'^view/?', include('view.urls')),
(r'^datatable/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
#
#
#(r'^view/?', include('view.urls')),
- #(r'^list/slices', 'view.list.slices'),
- #(r'^list/(?P<object_type>[^/]+)', 'view.list.default'),
+ #(r'^list/slices', 'view.list.slices')
#
#
# Portal
#
#
# Portal
+ (r'^testbeds/?$', portal.testbedlist.TestbedList.as_view()),
+ (r'^slice/(?P<slicename>[^/]+)/?$', portal.sliceview.SliceView.as_view()),
url(r'^portal/', include('portal.urls')),
]
url(r'^portal/', include('portal.urls')),
]