X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=myslice%2Furls.py;h=67bb75d99e1298e09d5d3db443fa7b089f85ce8a;hb=da0b290c0d86afe3d388f4b1a8be60a70b39ed92;hp=64197267f74db3fb9ade59ba7d5a35a7f09ab1b2;hpb=c1f803384ad060eeedb52c29d149317b07bd2d37;p=unfold.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 64197267..67bb75d9 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -1,5 +1,6 @@
 from django.conf.urls import patterns, include, url
 from django.conf      import settings
+from django.contrib import admin
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin
@@ -29,7 +30,7 @@ the_after_login_view=dashboard_view
 # where to redirect when login is required
 # might need another one ?
 the_login_view=home_view
-
+admin.autodiscover()
 urls = [
     '',
     # Examples:
@@ -38,7 +39,7 @@ urls = [
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     # Uncomment the next line to enable the admin:
-    # url(r'^admin/', include(admin.site.urls)),
+     url(r'^admin/', include(admin.site.urls)),
     #
     # default / view
     (r'^/?$', the_default_view),
@@ -52,7 +53,18 @@ urls = [
     (r'^logout/?$', 'auth.views.logout_user'),
     #
     # the manifold proxy
-    (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifold.manifoldproxy.proxy'),
+    (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifoldapi.manifoldproxy.proxy'),
+    #
+    #
+    # RESTful interface
+    (r'^rest/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
+    (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'),
+    #
     #
     # Portal
     url(r'^portal/', include('portal.urls')),