Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.198
edited by Jip-jan Alunkel
on July 14, 01:46
Change comment: Update document after refactoring.
To version 2.206
edited by Jip-jan Alunkel
on July 14, 02:06
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -168,20 +168,17 @@
168 168   <option value="$doc.space">$doc.getTitle()</option>
169 169   #end
170 170   #elseif($O_elementData.select-json)
171 + #set($json = {})
171 171   #if($O_elementData.select-json.keySet())
172 172   #set($json = $O_elementData.select-json)
173 173   #else
174 174   #set($jsondoc = $xwiki.getDocument($O_elementData.select-json))
175 - #set($discard = $jsondoc.setContentType('application/json'))
176 - #set($json = $jsontool.serialize($jsondoc.getContent()))
177 - #set($j = $jsontool.fromString($json))
178 -#set($assign = "$escapetool.getHash()set($map = $j)")
179 -#evaluate($assign)
180 -
181 -$map.CET
182 -#set($json = $map)
183 -create json from page
184 -
176 + #set($jsoncontent = $jsontool.fromString($jsontool.serialize($jsondoc.getContent())))
177 +#set($test = $jsontool.parse($jsoncontent))
178 +$test.CET
179 +#set($assign = "$escapetool.getHash()set($map = $jsoncontent)")
180 + #evaluate($assign)
181 + #set($json = $map)
185 185   #end
186 186   #foreach($key in $json.keySet())
187 187   #if($O_elementData.select-json-spaces == "true")