git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed JSON error when login (MetaData)
[myslice.git]
/
unfold
/
page.py
diff --git
a/unfold/page.py
b/unfold/page.py
index
a9228ec
..
d239888
100644
(file)
--- a/
unfold/page.py
+++ b/
unfold/page.py
@@
-117,18
+117,20
@@
class Page:
metadata_auth = {'AuthMethod':'anonymous'}
metadata_auth = {'AuthMethod':'anonymous'}
- metadata = MetaData (metadata_auth)
+ from myslice.settings import config
+ url = config.manifold_url()
+ metadata = MetaData(url, metadata_auth)
metadata.fetch(self.request)
# store it for next time
metadata.fetch(self.request)
# store it for next time
- manifold['metadata']=metadata
+ manifold['metadata']=metadata
.to_json()
# SessionCache().store_metadata(self.request, metadata)
logger.debug("Page.get_metadata: return new value")
# SessionCache().store_metadata(self.request, metadata)
logger.debug("Page.get_metadata: return new value")
- return metadata
+ return metadata
.to_json()
def expose_js_metadata (self):
# expose global MANIFOLD_METADATA as a js variable
# xxx this is fetched synchroneously..
def expose_js_metadata (self):
# expose global MANIFOLD_METADATA as a js variable
# xxx this is fetched synchroneously..
- self.add_js_init_chunks("var MANIFOLD_METADATA =" + self.get_metadata()
.to_json()
+ ";\n")
+ self.add_js_init_chunks("var MANIFOLD_METADATA =" + self.get_metadata() + ";\n")
def expose_js_var(self, name, value):
# expose variable as a js value
def expose_js_var(self, name, value):
# expose variable as a js value