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

[unfold.git] / myslice / settings.py

diff --git a/myslice/settings.py b/myslice/settings.py
index 4f65538..30887d6 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -31,6 +31,8 @@ if not os.path.isdir (os.path.join(HTTPROOT,"static")):
     HTTPROOT=ROOT
     DATAROOT=ROOT
 
+print "HTTPROOT = ",HTTPROOT
+
 if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT
 if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT
 
@@ -202,7 +204,7 @@ INSTALLED_APPS = [
     # our django project
     'myslice',
     # the core of the UI
-    'auth', 'manifold', 'unfold',
+    'auth', 'manifoldapi', 'unfold',
     # plugins
     'plugins',
     # views - more or less stable 
@@ -214,6 +216,7 @@ INSTALLED_APPS = [
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'portal',
+    'rest',
 ]
 for aux in auxiliaries:
     if os.path.isdir(os.path.join(ROOT,aux)): 
@@ -256,7 +259,7 @@ AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend','django.contr
 ### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
 # without this setting django will return a 403 forbidden error, which is fine
 # if you need to see the error message then use this setting
-CSRF_FAILURE_VIEW = 'manifold.manifoldproxy.csrf_failure'
+CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
 
 #################### for insert_above
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"