Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.189
edited by Jip-jan Alunkel
on July 14, 01:34
Change comment: Update document after refactoring.
To version 2.190
edited by Jip-jan Alunkel
on July 14, 01:35
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -169,12 +169,21 @@
169 169   #end
170 170   #elseif($O_elementData.select-json)
171 171   #if($O_elementData.select-json.keySet())
172 +json
172 172   #set($json = $O_elementData.select-json)
173 173   #else
174 - #set($jsonpage = $xwiki.getDocument($O_elementData.select-json))
175 - #set($discard = $jsonpage.setContentType('application/json'))
176 - #set($jsoncontent = $jsontool.serialize($jsonpage.getContent()))
177 - #set($j = $jsontool.fromString($jsoncontent))
175 + #set ($queryString = $escapetool.url({
176 + 'xpage': 'plain',
177 + 'outputSyntax': 'plain'
178 + }))
179 +## #set ($json = $xwiki.getURL($O_elementData.select-json, 'get', $queryString))
180 + #set($json = $xwiki.getDocument($O_elementData.select-json))
181 + #set($discard = $json.setContentType('application/json'))
182 +
183 + #set($json = $jsontool.serialize($json.getContent()))
184 +$json.class.name
185 +##$jsontool.serialize($json)
186 + #set($j = $jsontool.fromString($json))
178 178  #set($assign = "$escapetool.getHash()set($map = $j)")
179 179  #evaluate($assign)
180 180