Last modified by Alex Cotiuga on 2026/07/27 06:09

From version 18.25
edited by Alex Cotiuga
on 2026/07/09 20:47
Change comment: There is no comment for this version
To version 18.22
edited by Alex Cotiuga
on 2026/07/09 20:35
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -21,6 +21,7 @@
21 21   #set ($scope = '')
22 22   #set ($contactWebsite = '')
23 23   #set ($startedAtRaw = '')
24 + #set ($sourcePage = '')
24 24  
25 25   ## Extract only the values we need for validation.
26 26   #foreach ($parameterName in $request.parameterNames)
... ... @@ -122,6 +122,7 @@
122 122   ## Save only known ContactRequest fields.
123 123   #foreach ($parameterName in $request.parameterNames)
124 124   #if ($parameterName == 'sourcePage')
126 + #set ($sourcePage = $stringtool.trim($request.get($parameterName)))
125 125   #set ($discard = $contactRequestObj.set($parameterName, $stringtool.trim($request.get($parameterName))))
126 126   #end
127 127   #set ($propertyParts = $parameterName.split('_0_'))
... ... @@ -170,27 +170,29 @@
170 170   <form id="contactForm">
171 171   <dl>
172 172   #foreach ($property in $xclass.properties)
173 - #if (!$hiddenProperties.contains($property.name))
174 - #if ($property.name == 'hosting')
175 - <hr>
176 - <h3>Optional project details</h3>
177 - <p>These details help us understand the scope and suggest practical next steps.</p>
178 - #end
179 - <dt #if (!$editing && $hasEdit)
180 - class="editableProperty"
181 - #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
182 - data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
183 - data-property-type="object"#end>
184 - ## This must match the id generated by the $doc.display() method below.
185 - #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
186 - <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
187 - $escapetool.xml($property.translatedPrettyName)
188 - </label>
189 - ## Support for specifying a translation key as hint in the property definition.
190 - <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
191 - </dt>
192 - <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
175 + #set ($hiddenPropertiesCSS = '')
176 + #if ($hiddenProperties.contains($property.name))
177 + #set ($hiddenPropertiesCSS = 'class="hidden"')
193 193   #end
179 + #if ($property.name == 'hosting')
180 + <hr>
181 + <h3>Optional project details</h3>
182 + <p>These details help us understand the scope and suggest practical next steps.</p>
183 + #end
184 + <dt $hiddenPropertiesCSS #if (!$editing && $hasEdit)
185 + class="editableProperty"
186 + #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
187 + data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
188 + data-property-type="object"#end>
189 + ## This must match the id generated by the $doc.display() method below.
190 + #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
191 + <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
192 + $escapetool.xml($property.translatedPrettyName)
193 + </label>
194 + ## Support for specifying a translation key as hint in the property definition.
195 + <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
196 + </dt>
197 + <dd $hiddenPropertiesCSS>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
194 194   #end
195 195   #if (!$xclass.properties || $xclass.properties.size() == 0)
196 196   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -211,7 +211,7 @@
211 211   />
212 212   </div>
213 213   <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
214 - <input type="hidden" name="sourcePage" />
218 + <input type="hidden" name="sourcePage" value="$!{request.sourcePage}" />
215 215   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
216 216   </form>
217 217   #end