git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rollback to django session management
[unfold.git]
/
manifoldapi
/
manifoldproxy.py
diff --git
a/manifoldapi/manifoldproxy.py
b/manifoldapi/manifoldproxy.py
index
a5bc20d
..
eba37bb
100644
(file)
--- 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 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
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:
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':
return HttpResponse (json.dumps({'code':0,'value':[]}), content_type="application/json")
if debug_empty and manifold_query.action.lower()=='get':