Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.283
edited by Jip-jan Alunkel
on August 09, 14:15
Change comment: Update document after refactoring.
To version 2.285
edited by Jip-jan Alunkel
on August 15, 14:33
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -16,7 +16,7 @@
16 16   "novalidate": "novalidate"
17 17   }
18 18  </script>
19 -<div class="pagemaker">
19 +<div class="pagemaker active">
20 20   #else
21 21  <form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="$formclass" data-form-product="${elementDataObj.product}" novalidate="novalidate">
22 22   #end
... ... @@ -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.pagemakerClass'))
161 + #set($mydoc = $xwiki.getDocument('assets.pagemaker.classes.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.pagemakerClass", true))
189 + #set($rightXObj = $doc.getObject("assets.pagemaker.classes.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.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"))
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.pagemakerClass", true)) ## Get or create the needed object.
219 + #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.classes.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.