Changes for page Macros
Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.344
edited by Jip-jan Alunkel
on January 02, 12:47
on January 02, 12:47
Change comment:
Update document after refactoring.
To version 2.354
edited by Jip-jan Alunkel
on January 30, 13:03
on January 30, 13:03
Change comment:
Update document after refactoring.
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -179,101 +179,29 @@ 179 179 #end 180 180 181 181 #macro(createSelectElement $O_elementData $O_tagName) 182 - #set($tparentReference = $services.model.resolveDocument('', 'default', $doc.documentReference.lastSpaceReference).parent.getName()) 183 - #set($tparentTitle = $tparentReference.getName()) 184 -$tparentReference 185 - <select class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if(${O_elementData.data-set-space}) data-set-space="${O_elementData.data-set-space}"#end#if($O_elementData.data-parent-space) data-parent-space="${O_elementData.data-parent-space}"#end#if($O_elementData.data-select-spaces-to-json) data-select-spaces-to-json="${O_elementData.data-select-spaces-to-json}"#end name="${O_elementData.id}" id="${O_elementData.id}"> 182 + #set($currentSpaceName = $services.model.resolveDocument('', 'default', $doc.documentReference.lastSpaceReference).parent.getName()) 183 + <select class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if(${O_elementData.data-set-space}) data-set-space="${O_elementData.data-set-space}" data-parent-space="${currentSpaceName}"#end name="${O_elementData.id}" id="${O_elementData.id}"> 186 186 #if($O_elementData.placeholder) 187 - #if($O_elementData.select-json && $O_elementData.select-json.keySet().contains($O_elementData.value)) 188 - #else 185 + #if($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value)) 189 189 <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option> 190 190 #end 191 191 #end 192 - #set($mydoc = $xwiki.getDocument('assets.pagemaker.classes.pagemakerClass')) 193 - #if($mydoc.isNew() && $hasProgramming) 194 - #set ($myinternaldoc = $mydoc.getDocument()) 195 - #set ($myclass = $myinternaldoc.getXClass()) 196 - #set ($discard = $myclass.addTextField("pmSpaceOrder", "pageMaker space order", 10)) 197 - #set ($discard = $mydoc.save()) 189 + 190 + ## Get the JSON data. 191 + #set($json = {}) 192 + #if($O_elementData.select-json.keySet()) 193 + #set($json = $O_elementData.select-json) 194 + #else 195 + #set($jsondoc = $xwiki.getDocument($O_elementData.select-json)) 196 + #set($jsoncontent = $jsontool.fromString($jsontool.serialize($jsondoc.getContent()))) 197 + #set($json = $jsontool.parse($jsoncontent)) 198 198 #end 199 - #set($removedNr = 0) 200 200 201 - #if($O_elementData.select-space-reference) 202 - #set($space = $O_elementData.select-space-reference) 203 - #set($codespace = "") 204 - #if($xwiki.getSpaces().contains("${space}.${space}Code")) 205 - #set($codespace = "${space}Code") 206 - #elseif($xwiki.getSpaces().contains("${space}.Code")) 207 - #set($codespace = "Code") 208 - #elseif($xwiki.getSpaces().contains("${space}.code")) 209 - #set($codespace = "code") 210 - #end 211 - 212 - #if(!$isGuest) 213 - ## Add XObjects to current child spaces so the spaces can be queried on the XObject to generate the select options. 214 - #set($nameExcludeRef = $codespace) 215 - #set($spaceAbsRef = $space.replaceAll('([%_!])', '!$1')) 216 - #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")) 217 - #set($result_add_xobj = $query_add_xobj.bindValue('space', $spaceAbsRef).bindValue('nameExclude', $nameExcludeRef).addFilter('unique').execute()) 218 - #foreach($item in $result_add_xobj) 219 - #set($doc = $xwiki.getDocument("${space}.${item}.WebHome")) 220 - #set($rightXObj = $doc.getObject("assets.pagemaker.classes.pagemakerClass", true)) 221 - #set($discard = $rightXObj.set('pmSpaceOrder', $foreach.count)) 222 - #set($discard = $doc.save()) 223 - #end 224 - #end 225 - 226 - #set($spaceExcludeRef = $space.replaceAll('([%_!])', '!$1').concat(".${codespace}")) 227 - #set($spaceLikeRef = $space.replaceAll('([%_!])', '!$1').concat('.%')) 228 - #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")) 229 - #set($result = $query.bindValue('space', $spaceLikeRef).bindValue('spaceExclude', $spaceExcludeRef).addFilter('unique').execute()) 230 - 231 - ## Generate the select options from all child spaces that have the 'assets.pagemaker.pagemakerClass' XClass. 232 - ## The order is still random but the JSON can be extracted from the console with the 'select-spaces-to-json' attribute. 233 - #foreach($item in $result) 234 - #set($doc = $xwiki.getDocument($item)) 235 - <option value="$doc.space">$doc.getTitle()</option> 236 - #end 237 - #elseif($O_elementData.select-json) 238 - #set($json = {}) 239 - #if($O_elementData.select-json.keySet()) 240 - #set($json = $O_elementData.select-json) 241 - #else 242 - #set($jsondoc = $xwiki.getDocument($O_elementData.select-json)) 243 - #set($jsoncontent = $jsontool.fromString($jsontool.serialize($jsondoc.getContent()))) 244 - #set($json = $jsontool.parse($jsoncontent)) 245 - #end 246 - #foreach($key in $json.keySet()) 247 - #if(!$isGuest && $O_elementData.select-json-to-spaces == "true") 248 - #set($spaceDocTitle = $json.get($key)) 249 - #set($spaceDoc = $xwiki.getDocument("${key}.WebHome")) ## Fetch doc or create one if it does not exist by this name. 250 - #set($spaceXObj = $spaceDoc.getObject("assets.pagemaker.classes.pagemakerClass", true)) ## Get or create the needed object. 251 - #set($order_error = ($spaceXObj.getProperty('pmSpaceOrder').value != $foreach.count)) 252 - #set($title_error = ($spaceDoc.getTitle() != $spaceDocTitle)) 253 - #if($spaceDoc.isNew()) ## Doc did not exist so spaceDoc needs a title and a default locale. 254 - #set($discard = $spaceDoc.setTitle($spaceDocTitle)) ## Title. 255 - #set($discard = $spaceDoc.setDefaultLocale("en")) ## Locale. 256 - #set($discard = $spaceXObj.set("pmSpaceOrder", $foreach.count)) ## Set the property with the (correct) value. 257 - #set($discard = $spaceDoc.save()) 258 - #else 259 - #if($title_error) ## Doc did exist but the title did not match with the JSON value. 260 - #set($discard = $spaceDoc.setTitle($spaceDocTitle)) 261 - #end 262 - #if($order_error) ## Either the property does not exist or the value is incorrect. 263 - #set($discard = $spaceXObj.set("pmSpaceOrder", $foreach.count)) ## Set the property with the (correct) value. 264 - #end 265 - #if($title_error || $order_error) ## Save only if changed 266 - #set($discard = $spaceDoc.save()) 267 - #end 268 - #end 269 - #end 270 - <option value="$key"#if($O_elementData.value=="$key") selected="selected"#end>$json[$key]</option> 271 - #end 200 + ## Loop through the JSON data to create the options. 201 + #foreach($key in $json.keySet()) 202 + <option value="$key">$json[$key]</option> 272 272 #end 273 273 </select> 274 - #if($removedNr > 0) 275 - $removedNr pages had the XObject <span class="terminal">${removeXObj}</span> removed. 276 - #end 277 277 #end 278 278 #macro(createTextElement $O_elementData $O_tagName) 279 279 <input type="text" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end autocomplete="off"#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#if($O_elementData.data-pattern) data-pattern="${O_elementData.data-pattern}"#end#if($O_elementData.data-auto-first-capital) data-auto-first-capital="${O_elementData.data-auto-first-capital}"#end#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}" data-query-reference="${O_elementData.data-query-reference}"#end#if($O_elementData.data-page-name) data-page-name="${O_elementData.data-page-name}"#end#if($O_elementData.data-query-list-type) data-query-list-type="${O_elementData.data-query-list-type}"#end#if($O_elementData.data-query-list-header) data-query-list-header="${O_elementData.data-query-list-header}"#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"#end#if($O_elementData.data-create-page) data-create-page="${O_elementData.data-create-page}"#end#if(${O_elementData.data-set-space}) data-set-space="${O_elementData.data-set-space}"#end#if($O_elementData.data-parent-space) data-parent-space="${O_elementData.data-parent-space}"#end#if($O_elementData.data-query-scope) data-query-scope="${O_elementData.data-query-scope}"#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"#end#if($O_elementData.data-ajax-check) data-ajax-check="${O_elementData.data-ajax-check}"#end#if($O_elementData.data-modal-input) data-modal-input="${O_elementData.data-modal-input}"#end#if($O_elementData.data-default-value) data-default-value="${O_elementData.data-default-value}"#end> ... ... @@ -310,8 +310,8 @@ 310 310 <input type="url" class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end autocomplete="off" pattern="https?://.*"#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"#end> 311 311 #end 312 312 #macro(createCheckboxElement $O_elementData) 313 - <input type="checkbox" name="${O_elementData.id}"#if($O_elementData.value=="1") checked="checked"#end value="1" id="${O_elementData.id}"#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#end#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end>$O_elementData.label 314 - <input name="${O_elementData.id}" type="hidden"#if($O_elementData. value=="1")value="0"#elsevalue="1"#end>241 + <input type="checkbox" name="${O_elementData.id}"#if($O_elementData.value=="1") checked="checked"#end value="1" id="${O_elementData.id}"#if($O_elementData.data-opener) data-opener="${O_elementData.data-opener}"#end#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end>$O_elementData.label 242 + <input name="${O_elementData.id}" type="hidden" value="0"#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"#end> 315 315 #end 316 316 #macro(createTextareaElement $O_elementData $O_tagName) 317 317 ... ... @@ -341,6 +341,7 @@ 341 341 #end 342 342 #macro(createSubmit $O_submit) 343 343 <div class="clearfix"> 272 + <input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" /> 344 344 <p class="alert alert-warning alert-button-float-right"> 345 345 <span class="alert-button pull-right"> 346 346 #if ($xcontext.user != 'XWiki.XWikiGuest')