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

From version 18.6
edited by Alex Cotiuga
on 2026/07/09 19:54
Change comment: There is no comment for this version
To version 18.14
edited by Alex Cotiuga
on 2026/07/09 20:12
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)
... ... @@ -121,12 +121,16 @@
121 121  
122 122   ## Save only known ContactRequest fields.
123 123   #foreach ($parameterName in $request.parameterNames)
125 + #if ($parameterName == 'sourcePage')
126 + #set ($sourcePage = $stringtool.trim($request.get($parameterName)))
127 + #set ($discard = $contactRequestObj.set('Agnease.Code.ContactRequest.ContactRequestClass_0_sourcePage', $stringtool.trim($request.get($parameterName))))
128 + #end
124 124   #set ($propertyParts = $parameterName.split('_0_'))
125 125   #if ($propertyParts.size() > 1)
126 126   #set ($propertyName = $propertyParts[1])
127 127  
128 128   #if ($allowedProperties.contains($propertyName))
129 - #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
134 + #set ($discard = $contactRequestObj.set($propertyName, $stringtool.trim($request.get($parameterName))))
130 130   #end
131 131   #end
132 132   #end
... ... @@ -163,30 +163,33 @@
163 163   ## As a measure to avoid high load on website.
164 164   Tell us more about your project at <a href="mailto:alex@agnease.com">alex@agnease.com</a>
165 165   #else
171 + #set ($hiddenProperties = ['sourcePage'])
166 166   <form id="contactForm">
167 167   <dl>
168 168   #foreach ($property in $xclass.properties)
175 + #set ($hiddenPropertiesCSS = '')
176 + #if ($hiddenProperties.contains($property.name))
177 + #set ($hiddenPropertiesCSS = 'class="hidden"')
178 + #end
169 169   #if ($property.name == 'hosting')
170 170   <hr>
171 171   <h3>Optional project details</h3>
172 172   <p>These details help us understand the scope and suggest practical next steps.</p>
173 173   #end
174 - <div>
175 - <dt #if (!$editing && $hasEdit)
176 - class="editableProperty"
177 - #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
178 - data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
179 - data-property-type="object"#end>
180 - ## This must match the id generated by the $doc.display() method below.
181 - #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
182 - <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
183 - $escapetool.xml($property.translatedPrettyName)
184 - </label>
185 - ## Support for specifying a translation key as hint in the property definition.
186 - <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
187 - </dt>
188 - <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
189 - </div>
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>
190 190   #end
191 191   #if (!$xclass.properties || $xclass.properties.size() == 0)
192 192   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -207,6 +207,7 @@
207 207   />
208 208   </div>
209 209   <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
218 + <input type="hidden" name="sourcePage" value="$!{request.sourcePage}" />
210 210   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
211 211   </form>
212 212   #end