Author: wiggy
Date: Wed Nov 5 15:13:45 2008
New Revision: 59726
Modified:
kukit/kss.core/trunk/docs/HISTORY.txt
kukit/kss.core/trunk/kss/core/pluginregistry/json/utils.py
Log:
Merge r59725 from 1.4 branch
Modified: kukit/kss.core/trunk/docs/HISTORY.txt
==============================================================================
--- kukit/kss.core/trunk/docs/HISTORY.txt (original)
+++ kukit/kss.core/trunk/docs/HISTORY.txt Wed Nov 5 15:13:45 2008
@@ -4,8 +4,10 @@
kss.core - 1.5dev Unreleased
- - ...
-
+ - Use the real request in the json logic so skin layers, request parmeters,
+ etc. are available.
+ [wichert]
+
- Replaced license header of third-party sarissa.js
to workaround the license detection of ohloh.
sarissa.js is redistributed under GNU GPL v2
Modified: kukit/kss.core/trunk/kss/core/pluginregistry/json/utils.py
==============================================================================
--- kukit/kss.core/trunk/kss/core/pluginregistry/json/utils.py (original)
+++ kukit/kss.core/trunk/kss/core/pluginregistry/json/utils.py Wed Nov 5
15:13:45 2008
@@ -14,10 +14,12 @@
'Gets the addon javascript files for json'
files = []
# Try adding the jsonserver files
- request = TestRequest()
+ request = getattr(capi.getSiteManager(), 'REQUEST', None)
+
try:
- # use the files already registered to that concat resource
- jsonrpc = capi.getAdapter(request, Interface, 'jsonrpc.js')
+ if request is not None:
+ # use the files already registered to that concat resource
+ jsonrpc = capi.getAdapter(request, Interface, 'jsonrpc.js')
except capi.ComponentLookupError:
pass # JSON not present.
else:
_______________________________________________
Kukit-checkins mailing list
[email protected]
http://codespeak.net/mailman/listinfo/kukit-checkins
