Skip to Content
Last modified by Alex Cotiuga on 2026/07/27 06:09
From version 18.29
edited by Alex Cotiuga
on 2026/07/09 21:06
Change comment: There is no comment for this version
To version 18.18
edited by Alex Cotiuga
on 2026/07/09 20:30
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,7 +122,8 @@
122 122   ## Save only known ContactRequest fields.
123 123   #foreach ($parameterName in $request.parameterNames)
124 124   #if ($parameterName == 'sourcePage')
125 - #set ($discard = $contactRequestObj.set($parameterName, $stringtool.trim($request.get($parameterName))))
126 + #set ($sourcePage = $stringtool.trim($request.get($parameterName)))
127 + #set ($discard = $contactRequestObj.set('Agnease.Code.ContactRequest.ContactRequestClass_0_sourcePage', $stringtool.trim($request.get($parameterName))))
126 126   #end
127 127   #set ($propertyParts = $parameterName.split('_0_'))
128 128   #if ($propertyParts.size() > 1)
... ... @@ -135,48 +135,6 @@
135 135   #end
136 136  
137 137   #set ($discard = $contactRequestDoc.saveAsAuthor())
138 - ## Send internal notification email.
139 - ## This is intentionally best-effort: if email fails, the contact request is still saved.
140 - #try('mailException')
141 - #set ($notificationRecipient = 'alex@agnease.com')
142 - #set ($notificationSubject = 'New Agnease contact request')
143 - #set ($notificationBody = "
144 - Name:
145 - $!contactRequestObj.getValue('name')
146 -
147 - Email:
148 - $!contactRequestObj.getValue('email')
149 -
150 - Source page:
151 - $!contactRequestObj.getValue('sourcePage')
152 -
153 - Already uses XWiki:
154 - $!contactRequestObj.get('alreadyUseXWiki')
155 -
156 - Hosting:
157 - $!contactRequestObj.get('hosting')
158 -
159 - Custom development:
160 - $!contactRequestObj.get('customDevelopment')
161 -
162 - Timeline:
163 - $!contactRequestObj.get('timeline')
164 -
165 - Users:
166 - $!contactRequestObj.get('users')
167 -
168 - Message:
169 - $!contactRequestObj.getValue('scope')
170 -
171 - Internal request page:
172 - $contactRequestDoc.getExternalURL()
173 - ")
174 -
175 - #set ($message = $services.mail.sender.createMessage($notificationRecipient, $notificationSubject))
176 - #set ($discard = $message.setType('Agnease Contact Request'))
177 - #set ($discard = $message.addPart('text/plain', $notificationBody))
178 - #set ($mailResult = $services.mail.sender.sendAsynchronously([$message], 'database'))
179 - #end
180 180   #set ($statusCode = 200)
181 181   #set ($message = 'Your request was successfully sent.')
182 182   #end
... ... @@ -212,27 +212,29 @@
212 212   <form id="contactForm">
213 213   <dl>
214 214   #foreach ($property in $xclass.properties)
215 - #if (!$hiddenProperties.contains($property.name))
216 - #if ($property.name == 'hosting')
217 - <hr>
218 - <h3>Optional project details</h3>
219 - <p>These details help us understand the scope and suggest practical next steps.</p>
220 - #end
221 - <dt #if (!$editing && $hasEdit)
222 - class="editableProperty"
223 - #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
224 - data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
225 - data-property-type="object"#end>
226 - ## This must match the id generated by the $doc.display() method below.
227 - #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
228 - <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
229 - $escapetool.xml($property.translatedPrettyName)
230 - </label>
231 - ## Support for specifying a translation key as hint in the property definition.
232 - <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
233 - </dt>
234 - <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"')
235 235   #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>
236 236   #end
237 237   #if (!$xclass.properties || $xclass.properties.size() == 0)
238 238   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -253,7 +253,7 @@
253 253   />
254 254   </div>
255 255   <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
256 - <input type="hidden" name="sourcePage" />
218 + <input type="hidden" name="sourcePage" value="$!{request.sourcePage}" />
257 257   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
258 258   </form>
259 259   #end