Changes for page Macros

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -147,12 +147,13 @@
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	+ if()
150	150	#set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
151	151	#set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
152	152	#set($discard = $doc.save())
153	153	#end
154	154	#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,7 +169,8 @@
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", true)) ## Get or create the needed object.
	173	+ #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass")) ## Get the needed object if it exists.
	174	+ #if($spaceXObj)
173	173	#set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
174	174	#set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
175	175	#if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.