Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.105
edited by Jip-jan Alunkel
on June 28, 23:37
Change comment: Update document after refactoring.
To version 2.106
edited by Jip-jan Alunkel
on June 28, 23:39
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -147,12 +147,12 @@
147 147   #set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute())
148 148   #foreach($item in $result_add_xobj)
149 149   #set($doc = $xwiki.getDocument("${space}.${item}.WebHome"))
150 - #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass"))
151 151   #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
152 152   #set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
153 153   #set($discard = $doc.save())
154 154   #end
155 155   #end
155 +
156 156   #set($spaceExcludeRef = $space.replaceAll('([%_!])', '!$1').concat(".${codespace}"))
157 157   #set($spaceLikeRef = $space.replaceAll('([%_!])', '!$1').concat('.%'))
158 158   #set($query = $services.query.xwql("from doc.object(assets.pagemaker.pagemakerClass) met where doc.space like :space and doc.space <> :spaceExclude and doc.name <> 'WebPreferences' order by met.pmSpaceOrder asc"))
... ... @@ -169,8 +169,7 @@
169 169   #foreach($key in $json.keySet())
170 170   #set($spaceDocTitle = $json.get($key))
171 171   #set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name.
172 - #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass")) ## Get the needed object if it exists.
173 - #if($spaceXObj)
172 + #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass", true)) ## Get or create the needed object.
174 174   #set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
175 175   #set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
176 176   #if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.