From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 10 Feb 2014 12:41:41 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~2^2~6
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=b57d73b52870350b8150f00126394fd0df6d09f1

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

b57d73b52870350b8150f00126394fd0df6d09f1
diff --cc manifold/manifoldproxy.py
index f850fe91,debd1f7a..d0a8a3ea
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@@ -52,9 -52,10 +52,10 @@@ with the query passed using POST""
          # We allow some requests to use the ADMIN user account
          if (manifold_query.get_from() == 'local:user' and manifold_query.get_action() == 'create') \
                  or (manifold_query.get_from() == 'local:platform' and manifold_query.get_action() == 'get'):
 -            admin_user, admin_password = Config().manifold_admin_user_password()
 +            admin_user, admin_password = ConfigEngine().manifold_admin_user_password()
              manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
          else:
+             print request.session['manifold']
              manifold_api_session_auth = request.session['manifold']['auth']
  
          if debug_empty and manifold_query.action.lower()=='get':