Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -168,27 +168,29 @@
168	168	#set($json = $O_elementData.select-json)
169	169	#foreach($key in $json.keySet())
170	170	#set($spaceDocTitle = $json.get($key))
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($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
174		- #set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
175		- #if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.
176		- #set($discard = $spaceDoc.setTitle($spaceDocTitle)) ## Title.
177		- #set($discard = $spaceDoc.setDefaultLocale("en")) ## Locale.
178		- #set($discard = $spaceXObj.set("pmSpaceOrder", $foreach.count)) ## Set the property with the (correct) value.
179		- #set($discard = $spaceDoc.save())
180		- #else
181		- #if($title_error) ## Doc did exist but the title did not match with the JSON value.
182		- #set($discard = $spaceDoc.setTitle($spaceDocTitle))
183		- #end
184		- #if($order_error) ## Either the property does not exist or the value is incorrect.
	171	+ #if(!$isGuest)
	172	+ #set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name.
	173	+ #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass", true)) ## Get or create the needed object.
	174	+ #set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
	175	+ #set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
	176	+ #if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.
	177	+ #set($discard = $spaceDoc.setTitle($spaceDocTitle)) ## Title.
	178	+ #set($discard = $spaceDoc.setDefaultLocale("en")) ## Locale.
185	185	#set($discard = $spaceXObj.set("pmSpaceOrder", $foreach.count)) ## Set the property with the (correct) value.
186		- #end
187		- #if($title_error || $order_error) ## Save only if changed
188	188	#set($discard = $spaceDoc.save())
	181	+ #else
	182	+ #if($title_error) ## Doc did exist but the title did not match with the JSON value.
	183	+ #set($discard = $spaceDoc.setTitle($spaceDocTitle))
	184	+ #end
	185	+ #if($order_error) ## Either the property does not exist or the value is incorrect.
	186	+ #set($discard = $spaceXObj.set("pmSpaceOrder", $foreach.count)) ## Set the property with the (correct) value.
	187	+ #end
	188	+ #if($title_error || $order_error) ## Save only if changed
	189	+ #set($discard = $spaceDoc.save())
	190	+ #end
189	189	#end
190	190	#end
191		- <option value="$key">$json.get($key)</option>
	193	+ <option value="$key">$spaceDocTitle</option>
192	192	#end
193	193	#end
194	194	</select>