Wijzigen voor document Macros

Samenvatting

• Paginaeigenschappen (1 gewijzigd, 0 toegevoegd, 0 verwijderd)

Details

Paginaeigenschappen

Inhoud

...	...	@@ -1,5 +1,10 @@
1	1	{{velocity}}
2	2	#macro(createFormStart $elementDataObj)
	3	+ #if($elementDataObj.active == "false")
	4	+ #set($formclass = "pagemaker")
	5	+ #else
	6	+ #set($formclass = "pagemaker active")
	7	+ #end
3	3	#if($elementDataObj.use_captcha == "true")
4	4	<script>
5	5	const formAttributeValues = {
...	...	@@ -7,13 +7,13 @@
7	7	"action": "${elementDataObj.url}",
8	8	"method": "${elementDataObj.method}",
9	9	"data-form-product": "${elementDataObj.product}",
10		- "class": "pagemaker",
	15	+ "class": "$formclass",
11	11	"novalidate": "novalidate"
12	12	}
13	13	</script>
14		-<div class="pagemaker">
	19	+<div class="pagemaker active">
15	15	#else
16		-<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="pagemaker" data-form-product="${elementDataObj.product}" novalidate="novalidate">
	21	+<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="$formclass" data-form-product="${elementDataObj.product}" novalidate="novalidate">
17	17	#end
18	18	#end
19	19	#macro(createFormEnd $elementDataObj)
...	...	@@ -153,7 +153,7 @@
153	153	<option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
154	154	#end
155	155	#end
156		- #set($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
	161	+ #set($mydoc = $xwiki.getDocument('assets.pagemaker.classes.pagemakerClass'))
157	157	#if($mydoc.isNew() && $hasProgramming)
158	158	#set ($myinternaldoc = $mydoc.getDocument())
159	159	#set ($myclass = $myinternaldoc.getXClass())
...	...	@@ -181,7 +181,7 @@
181	181	#set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute())
182	182	#foreach($item in $result_add_xobj)
183	183	#set($doc = $xwiki.getDocument("${space}.${item}.WebHome"))
184		- #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
	189	+ #set($rightXObj = $doc.getObject("assets.pagemaker.classes.pagemakerClass", true))
185	185	#set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
186	186	#set($discard = $doc.save())
187	187	#end
...	...	@@ -189,7 +189,7 @@
189	189
190	190	#set($spaceExcludeRef = $space.replaceAll('([%_!])', '!$1').concat(".${codespace}"))
191	191	#set($spaceLikeRef = $space.replaceAll('([%_!])', '!$1').concat('.%'))
192		- #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"))
	197	+ #set($query = $services.query.xwql("from doc.object(assets.pagemaker.classes.pagemakerClass) met where doc.space like :space and doc.space <> :spaceExclude and doc.name <> 'WebPreferences' order by met.pmSpaceOrder asc"))
193	193	#set($result = $query.bindValue('space', $spaceLikeRef).bindValue('spaceExclude', $spaceExcludeRef).addFilter('unique').execute())
194	194
195	195	## Generate the select options from all child spaces that have the 'assets.pagemaker.pagemakerClass' XClass.
...	...	@@ -211,7 +211,7 @@
211	211	#if(!$isGuest && $O_elementData.select-json-to-spaces == "true")
212	212	#set($spaceDocTitle = $json.get($key))
213	213	#set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name.
214		- #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass", true)) ## Get or create the needed object.
	219	+ #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.classes.pagemakerClass", true)) ## Get or create the needed object.
215	215	#set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
216	216	#set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
217	217	#if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.