Skip to Content
Last modified by Alex Cotiuga on 2026/07/27 06:09
From version 18.27
edited by Alex Cotiuga
on 2026/07/09 21:01
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_'))
... ... @@ -135,56 +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 ($sourcePage = "$!contactRequestObj.getValue('sourcePage')")
143 -
144 - #set ($notificationSubject = 'New Agnease contact request')
145 - #if ($sourcePage != '')
146 - #set ($notificationSubject = "New Agnease contact request from $sourcePage")
147 - #end
148 -
149 - #set ($notificationBody = "
150 - New Agnease contact request
151 -
152 - Name:
153 - $!contactRequestObj.get('name')
154 -
155 - Email:
156 - $!contactRequestObj.get('email')
157 -
158 - Source page:
159 - $!contactRequestObj.get('sourcePage')
160 -
161 - Already uses XWiki:
162 - $!contactRequestObj.get('alreadyUseXWiki')
163 -
164 - Hosting:
165 - $!contactRequestObj.get('hosting')
166 -
167 - Custom development:
168 - $!contactRequestObj.get('customDevelopment')
169 -
170 - Timeline:
171 - $!contactRequestObj.get('timeline')
172 -
173 - Users:
174 - $!contactRequestObj.get('users')
175 -
176 - Message:
177 - $!contactRequestObj.get('scope')
178 -
179 - Internal request page:
180 - $xwiki.getURL($contactRequestDoc.fullName)
181 - ")
182 -
183 - #set ($message = $services.mail.sender.createMessage($notificationRecipient, $notificationSubject))
184 - #set ($discard = $message.setType('Agnease Contact Request'))
185 - #set ($discard = $message.addPart('text/plain', $notificationBody))
186 - #set ($mailResult = $services.mail.sender.sendAsynchronously([$message], 'database'))
187 - #end
188 188   #set ($statusCode = 200)
189 189   #set ($message = 'Your request was successfully sent.')
190 190   #end
... ... @@ -220,27 +220,29 @@
220 220   <form id="contactForm">
221 221   <dl>
222 222   #foreach ($property in $xclass.properties)
223 - #if (!$hiddenProperties.contains($property.name))
224 - #if ($property.name == 'hosting')
225 - <hr>
226 - <h3>Optional project details</h3>
227 - <p>These details help us understand the scope and suggest practical next steps.</p>
228 - #end
229 - <dt #if (!$editing && $hasEdit)
230 - class="editableProperty"
231 - #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
232 - data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
233 - data-property-type="object"#end>
234 - ## This must match the id generated by the $doc.display() method below.
235 - #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
236 - <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
237 - $escapetool.xml($property.translatedPrettyName)
238 - </label>
239 - ## Support for specifying a translation key as hint in the property definition.
240 - <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
241 - </dt>
242 - <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"')
243 243   #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>
244 244   #end
245 245   #if (!$xclass.properties || $xclass.properties.size() == 0)
246 246   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -261,7 +261,7 @@
261 261   />
262 262   </div>
263 263   <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
264 - <input type="hidden" name="sourcePage" />
218 + <input type="hidden" name="sourcePage" value="$!{request.sourcePage}" />
265 265   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
266 266   </form>
267 267   #end