0 Votes

Changes for page Public Web Site

Last modified by Alex Cotiugă on 2025/11/27 10:42

From version 3.76
edited by Alex Cotiugă
on 2025/11/24 16:02
Change comment: There is no comment for this version
To version 3.64
edited by Alex Cotiugă
on 2025/11/24 12:34
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -159,7 +159,7 @@
159 159   </div>
160 160   <div class="modal-body">
161 161   <div>
162 - ##Need help with your XWiki? <a href="mailto:alex@agnease.com">Contact Agnease</a>
162 + Need help with your XWiki? <a href="mailto:alex@agnease.com">Contact Agnease</a>
163 163   #displayFormFromSheetCode()
164 164   </div>
165 165   </div>
... ... @@ -172,14 +172,10 @@
172 172   </div>
173 173  #end
174 174  
175 -#macro (stripHTMLMacro $displayOutput)
176 - $stringtool.removeEnd($stringtool.removeStart($displayOutput, '{{html clean="false" wiki="false"}}'), '{{/html}}').replace('Agnease.Code.Lead.LeadClass_0_', 'acl')
177 -#end
178 -
179 179  #macro (displayFormFromSheetCode)
180 180   #set ($editing = true)
181 181   ## The object to display.
182 - #set ($xobject = $doc.newObject('Agnease.Code.Lead.LeadClass'))
178 + #set ($xobject = $doc.getObject('Agnease.Code.Lead.LeadClass'))
183 183   ## The class that describes the object properties.
184 184   #set ($xclass = $xwiki.getClass('Agnease.Code.Lead.LeadClass'))
185 185   ## Make sure the following display* method calls use the right object.
... ... @@ -194,7 +194,7 @@
194 194   data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
195 195   data-property-type="object"#end>
196 196   ## This must match the id generated by the $doc.display() method below.
197 - #set ($propertyId = "acl_$property.name")
193 + #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
198 198   <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
199 199   $escapetool.xml($property.translatedPrettyName)
200 200   </label>
... ... @@ -201,8 +201,7 @@
201 201   ## Support for specifying a translation key as hint in the property definition.
202 202   <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
203 203   </dt>
204 - #set ($displayOutput = $doc.display($property.name, 'edit'))
205 - <dd>#stripHTMLMacro($displayOutput)</dd>
200 + <dd>$doc.display($property.name, 'edit')</dd>
206 206   #end
207 207   #if (!$xclass.properties || $xclass.properties.size() == 0)
208 208   ## Keep the empty definition term in order to have valid HTML.