Änderungen von Dokument Macros

Zusammenfassung

• Seiteneigenschaften (1 geändert, 0 hinzugefügt, 0 gelöscht)

Details

Seiteneigenschaften

Inhalt

...	...	@@ -1,10 +1,5 @@
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
8	8	#if($elementDataObj.use_captcha == "true")
9	9	<script>
10	10	const formAttributeValues = {
...	...	@@ -12,13 +12,13 @@
12	12	"action": "${elementDataObj.url}",
13	13	"method": "${elementDataObj.method}",
14	14	"data-form-product": "${elementDataObj.product}",
15		- "class": "$formclass",
	10	+ "class": "pagemaker",
16	16	"novalidate": "novalidate"
17	17	}
18	18	</script>
19		-<div class="pagemaker active">
	14	+<div class="pagemaker">
20	20	#else
21		-<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="$formclass" data-form-product="${elementDataObj.product}" novalidate="novalidate">
	16	+<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="pagemaker" data-form-product="${elementDataObj.product}" novalidate="novalidate">
22	22	#end
23	23	#end
24	24	#macro(createFormEnd $elementDataObj)
...	...	@@ -158,7 +158,7 @@
158	158	<option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
159	159	#end
160	160	#end
161		- #set($mydoc = $xwiki.getDocument('assets.pagemaker.classes.pagemakerClass'))
	156	+ #set($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))
162	162	#if($mydoc.isNew() && $hasProgramming)
163	163	#set ($myinternaldoc = $mydoc.getDocument())
164	164	#set ($myclass = $myinternaldoc.getXClass())
...	...	@@ -186,7 +186,7 @@
186	186	#set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute())
187	187	#foreach($item in $result_add_xobj)
188	188	#set($doc = $xwiki.getDocument("${space}.${item}.WebHome"))
189		- #set($rightXObj = $doc.getObject("assets.pagemaker.classes.pagemakerClass", true))
	184	+ #set($rightXObj = $doc.getObject("assets.pagemaker.pagemakerClass", true))
190	190	#set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count))
191	191	#set($discard = $doc.save())
192	192	#end
...	...	@@ -194,7 +194,7 @@
194	194
195	195	#set($spaceExcludeRef = $space.replaceAll('([%_!])', '!$1').concat(".${codespace}"))
196	196	#set($spaceLikeRef = $space.replaceAll('([%_!])', '!$1').concat('.%'))
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"))
	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"))
198	198	#set($result = $query.bindValue('space', $spaceLikeRef).bindValue('spaceExclude', $spaceExcludeRef).addFilter('unique').execute())
199	199
200	200	## Generate the select options from all child spaces that have the 'assets.pagemaker.pagemakerClass' XClass.
...	...	@@ -216,7 +216,7 @@
216	216	#if(!$isGuest && $O_elementData.select-json-to-spaces == "true")
217	217	#set($spaceDocTitle = $json.get($key))
218	218	#set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name.
219		- #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.classes.pagemakerClass", true)) ## Get or create the needed object.
	214	+ #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.pagemakerClass", true)) ## Get or create the needed object.
220	220	#set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count))
221	221	#set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle))
222	222	#if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale.