Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -139,26 +139,27 @@
139	139	#set($codespace = "code")
140	140	#end
141	141
142		- #set($nameExcludeRef = $codespace)
143		- #set($spaceAbsRef = $space.replaceAll('([%_!])', '!$1'))
144		- #set($query_add_xobj = $services.query.xwql("select space.name from XWikiSpace as space where space.parent = :space and space.name <> :nameExclude and space.name <> 'WebPreferences' order by space.name"))
145		-
146		- ## Add XObjects to current child spaces so the spaces can be queried on the XObject to generate the select options.
147		- #set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute())
148		- #foreach($item in $result_add_xobj)
149		- #set($doc = $xwiki.getDocument("${space}.${item}.WebHome"))
150		- #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
151		- #set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
152		- #set($discard = $doc.save())
	142	+ #if(!$isGuest)
	143	+ ## Add XObjects to current child spaces so the spaces can be queried on the XObject to generate the select options.
	144	+ #set($nameExcludeRef = $codespace)
	145	+ #set($spaceAbsRef = $space.replaceAll('([%_!])', '!$1'))
	146	+ #set($query_add_xobj = $services.query.xwql("select space.name from XWikiSpace as space where space.parent = :space and space.name <> :nameExclude and space.name <> 'WebPreferences' order by space.name"))
	147	+ #set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute())
	148	+ #foreach($item in $result_add_xobj)
	149	+ #set($doc = $xwiki.getDocument("${space}.${item}.WebHome"))
	150	+ #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass"))
	151	+ #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
	152	+ #set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
	153	+ #set($discard = $doc.save())
	154	+ #end
153	153	#end
154		-
155	155	#set($spaceExcludeRef = $space.replaceAll('([%_!])', '!$1').concat(".${codespace}"))
156	156	#set($spaceLikeRef = $space.replaceAll('([%_!])', '!$1').concat('.%'))
157	157	#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"))
	159	+ #set($result = $query.bindValue('space', $spaceLikeRef).bindValue('spaceExclude', $spaceExcludeRef).addFilter('unique').execute())
158	158
159	159	## Generate the select options from all child spaces that have the 'assets.pagemaker.pagemakerClass' XClass.
160	160	## The order is still random but the JSON can be extracted from the console with the 'select-spaces-json' attribute.
161		- #set($result = $query.bindValue('space', $spaceLikeRef).bindValue('spaceExclude', $spaceExcludeRef).addFilter('unique').execute())
162	162	#foreach($item in $result)
163	163	#set($doc = $xwiki.getDocument($item))
164	164	<option value="$doc.space">$doc.getTitle()</option>
...	...	@@ -168,7 +168,8 @@
168	168	#foreach($key in $json.keySet())
169	169	#set($spaceDocTitle = $json.get($key))
170	170	#set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name.
171		- #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass", true)) ## Get or create the needed object.
	172	+ #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass")) ## Get the needed object if it exists.
	173	+ #if($spaceXObj)
172	172	#set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
173	173	#set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
174	174	#if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.