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
254b1a9
..
d239888
100644
(file)
--- a/
unfold/page.py
+++ b/
unfold/page.py
@@
-1,5
+1,3
@@
-from __future__ import print_function
-
# the supervisor for Plugins
# keeps a handle on all present plugins for managing their queries in a consistent way
# it is expected to exist one such object for a given page
# the supervisor for Plugins
# keeps a handle on all present plugins for managing their queries in a consistent way
# it is expected to exist one such object for a given page
@@
-11,8
+9,10
@@
from django.template.loader import render_to_string
from manifoldapi.metadata import MetaData
from unfold.prelude import Prelude
from manifoldapi.metadata import MetaData
from unfold.prelude import Prelude
-
+from unfold.sessioncache import SessionCache
+
from myslice.configengine import ConfigEngine
from myslice.configengine import ConfigEngine
+from myslice.settings import logger
# decorator to deflect calls on this Page to its prelude
def to_prelude (method):
# decorator to deflect calls on this Page to its prelude
def to_prelude (method):
@@
-108,22
+108,29
@@
class Page:
# if cached, use it
if 'metadata' in manifold and isinstance(manifold['metadata'],MetaData):
# if cached, use it
if 'metadata' in manifold and isinstance(manifold['metadata'],MetaData):
- if debug: print("Page.get_metadata: return cached value")
+
+# cached_metadata = SessionCache().get_metadata(self.request)
+# if cached_metadata and isinstance(cached_metadata, MetaData):
+ logger.debug("Page.get_metadata: return cached value")
return manifold['metadata']
return manifold['metadata']
+# return cached_metadata
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
- if debug: print("Page.get_metadata: return new value")
- return metadata
+ manifold['metadata']=metadata.to_json()
+# SessionCache().store_metadata(self.request, metadata)
+ logger.debug("Page.get_metadata: return new value")
+ 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