X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifoldapi%2Fmanifoldproxy.py;fp=manifoldapi%2Fmanifoldproxy.py;h=eba37bb8ba177a28b6007a85d3a023f79f2d2b24;hb=47875c18877f9c482861cdede4832b94f13a11c3;hp=a5bc20da5736110daaf907df1eb3e74954b2101e;hpb=d46e16e2f5947147a208ee9721660639330e0d6b;p=unfold.git diff --git a/manifoldapi/manifoldproxy.py b/manifoldapi/manifoldproxy.py index a5bc20da..eba37bb8 100644 --- a/manifoldapi/manifoldproxy.py +++ b/manifoldapi/manifoldproxy.py @@ -12,7 +12,7 @@ from manifoldapi import ManifoldAPI from manifoldresult import ManifoldException from manifold.util.log import Log -from unfold.sessioncache import SessionCache +# from unfold.sessioncache import SessionCache from myslice.settings import config, logger @@ -61,8 +61,11 @@ def proxy (request,format): admin_user, admin_password = config.manifold_admin_user_password() manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password} else: - manifold_api_session_auth = SessionCache().get_auth(request) - if not manifold_api_session_auth: + if 'manifold' in request.session: + manifold_api_session_auth = request.session['manifold']['auth'] + else: + #manifold_api_session_auth = SessionCache().get_auth(request) + #if not manifold_api_session_auth: return HttpResponse (json.dumps({'code':0,'value':[]}), content_type="application/json") if debug_empty and manifold_query.action.lower()=='get':