Skip to Content
0 Votes

Changes for page Public Web Site

Last modified by Alex Cotiugă on 2025/11/27 10:42
From version 3.58
edited by Alex Cotiugă
on 2025/11/24 12:31
Change comment: There is no comment for this version
To version 3.74
edited by Alex Cotiugă
on 2025/11/24 15:59
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,12 +172,16 @@
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_', '')
177 +#end
178 +
175 175  #macro (displayFormFromSheetCode)
176 - #set ($editing = $xcontext.action == 'edit')
180 + #set ($editing = true)
177 177   ## The object to display.
178 - #set ($xobject = $doc.getObject('Agnease.Code.Lead.LeadClass'))
182 + #set ($xobject = $doc.newObject('Agnease.Code.Lead.LeadClass'))
179 179   ## The class that describes the object properties.
180 - #set ($xclass = $xwiki.getXWikiClass('Agnease.Code.Lead.LeadClass'))
184 + #set ($xclass = $xwiki.getClass('Agnease.Code.Lead.LeadClass'))
181 181   ## Make sure the following display* method calls use the right object.
182 182   #set ($discard = $doc.use($xobject))
183 183   ## Using the xform vertical form layout.
... ... @@ -184,13 +184,13 @@
184 184   <div class="xform">
185 185   <dl>
186 186   #foreach ($property in $xclass.properties)
187 - <dt #if (!$editing && $hasEdit)
191 + <dt #if (!$editing)
188 188   class="editableProperty"
189 189   #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
190 190   data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
191 191   data-property-type="object"#end>
192 192   ## This must match the id generated by the $doc.display() method below.
193 - #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
197 + #set ($propertyId = "$property.name")
194 194   <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
195 195   $escapetool.xml($property.translatedPrettyName)
196 196   </label>
... ... @@ -197,7 +197,8 @@
197 197   ## Support for specifying a translation key as hint in the property definition.
198 198   <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
199 199   </dt>
200 - <dd>$doc.display($property.name)</dd>
204 + #set ($displayOutput = $doc.display($property.name, 'edit'))
205 + <dd>#stripHTMLMacro($displayOutput)</dd>
201 201   #end
202 202   #if (!$xclass.properties || $xclass.properties.size() == 0)
203 203   ## Keep the empty definition term in order to have valid HTML.