Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

[myslice.git] / myslice / urls.py

diff --git a/myslice/urls.py b/myslice/urls.py
index d09f480..ca150a4 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -16,6 +16,7 @@ import portal.platformsview
 import portal.dashboardview
 import portal.homeview
 import portal.newsview
+import portal.loginwidget
 
 from portal.about                   import AboutView
 from portal.registrationview        import RegistrationView
@@ -91,6 +92,7 @@ urls = [
     (r'^create/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.create.dispatch'),
     (r'^delete/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.delete.dispatch'),
     (r'^credentials/(?P<action>[^/]+)/?$', 'rest.credentials.dispatch'),
+    (r'^cache/(?P<action>[^/]+)/?$', 'rest.cache.dispatch'),
     (r'^initscript/(?P<action>[^/]+)/?$', 'rest.initscript.dispatch'),
     #
     # REST monitoring
@@ -99,6 +101,8 @@ urls = [
     #(r'^view/?', include('view.urls')),
     #(r'^list/slices', 'view.list.slices')
     #
+    # Login widget to be used in an iframe
+    (r'^loginwidget/?$', portal.loginwidget.LoginWidget.as_view()),
     #
     # Portal
     (r'^news/?$', portal.newsview.NewsView.as_view()),
@@ -128,7 +132,7 @@ urls = [
     url(r'^portal/', include('portal.urls')),
 
     # SLA
-    url(r'^sla/', include('sla.urls')),
+#    url(r'^sla/', include('sla.urls')),
 ]
 
 #this one would not match the convention