Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.118
edited by Jip-jan Alunkel
on July 02, 22:44
Change comment: Update document after refactoring.
To version 2.119
edited by Jip-jan Alunkel
on July 02, 22:45
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -116,7 +116,7 @@
116 116  
117 117  #macro(createSelectElement $O_elementData $O_tagName)
118 118   <select class="form-select form-control"#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#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.select-spaces-json) data-select-spaces-json="true"#end name="${O_elementData.id}" id="${O_elementData.id}">
119 - #if($O_elementData.placeholder && ($O_elementData.select-json && $O_elementData.select-json.keySet().contains($O_elementData.value)))
119 + #if($O_elementData.placeholder && (!$O_elementData.select-json || ($O_elementData.select-json && !$O_elementData.select-json.keySet().contains($O_elementData.value)))
120 120   <option value="" disabled=""#if(!$O_elementData.value) selected=""#end hidden="hidden">${O_elementData.placeholder}</option>
121 121   #end
122 122   #set($mydoc = $xwiki.getDocument('assets.pagemaker.pagemakerClass'))