Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.192
edited by Jip-jan Alunkel
on July 14, 01:37
Change comment: Update document after refactoring.
To version 2.205
edited by Jip-jan Alunkel
on July 14, 02:05
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -168,22 +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 - #set($json = $xwiki.getDocument($O_elementData.select-json))
175 - #set($discard = $json.setContentType('application/json'))
176 -
177 - #set($json = $jsontool.serialize($json.getContent()))
178 -$json.class.name
179 -##$jsontool.serialize($json)
180 - #set($j = $jsontool.fromString($json))
181 -#set($assign = "$escapetool.getHash()set($map = $j)")
182 -#evaluate($assign)
183 -
184 -$map.CET
185 -create json from page
186 -
175 + #set($jsondoc = $xwiki.getDocument($O_elementData.select-json))
176 + #set($jsoncontent = $jsontool.fromString($jsontool.serialize($jsondoc.getContent())))
177 +#set($test = $jsontool.parse($jsoncontent))
178 +$test
179 +#set($assign = "$escapetool.getHash()set($map = $jsoncontent)")
180 + #evaluate($assign)
181 + #set($json = $map)
187 187   #end
188 188   #foreach($key in $json.keySet())
189 189   #if($O_elementData.select-json-spaces == "true")