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

From version 18.18
edited by Alex Cotiuga
on 2026/07/09 20:30
Change comment: There is no comment for this version
To version 19.1
edited by Alex Cotiuga
on 2026/07/27 06:09
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -21,7 +21,6 @@
21 21   #set ($scope = '')
22 22   #set ($contactWebsite = '')
23 23   #set ($startedAtRaw = '')
24 - #set ($sourcePage = '')
25 25  
26 26   ## Extract only the values we need for validation.
27 27   #foreach ($parameterName in $request.parameterNames)
... ... @@ -123,8 +123,7 @@
123 123   ## Save only known ContactRequest fields.
124 124   #foreach ($parameterName in $request.parameterNames)
125 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))))
125 + #set ($discard = $contactRequestObj.set($parameterName, $stringtool.trim($request.get($parameterName))))
128 128   #end
129 129   #set ($propertyParts = $parameterName.split('_0_'))
130 130   #if ($propertyParts.size() > 1)
... ... @@ -137,6 +137,48 @@
137 137   #end
138 138  
139 139   #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
140 140   #set ($statusCode = 200)
141 141   #set ($message = 'Your request was successfully sent.')
142 142   #end
... ... @@ -161,7 +161,8 @@
161 161  = Tell Us More About Your Project =
162 162  You do not need to have a full specification. A short description is enough to start the conversation.
163 163  {{html clean="false"}}
164 -You can also <a href="https://calendly.com/alex-agnease/30min?back=1&month=2026-06" target="_blank">book a free XWiki review call</a> to discuss your current setup.
204 + <p>You can also <a href="https://calendly.com/alex-agnease/30min?back=1&month=2026-06" target="_blank">book a free XWiki review call</a> to discuss your current setup.</p>
205 + <p>Looking for a starting point first? <a href="$xwiki.getURL('pricing.WebHome')">View XWiki service packages and starting prices</a>.</p>
165 165   <div class="row">
166 166   <div class="xform col-md-7">
167 167   #if ($totalRequests.size() > 50)
... ... @@ -172,29 +172,27 @@
172 172   <form id="contactForm">
173 173   <dl>
174 174   #foreach ($property in $xclass.properties)
175 - #set ($hiddenPropertiesCSS = '')
176 - #if ($hiddenProperties.contains($property.name))
177 - #set ($hiddenPropertiesCSS = 'class="hidden"')
216 + #if (!$hiddenProperties.contains($property.name))
217 + #if ($property.name == 'hosting')
218 + <hr>
219 + <h3>Optional project details</h3>
220 + <p>These details help us understand the scope and suggest practical next steps.</p>
221 + #end
222 + <dt #if (!$editing && $hasEdit)
223 + class="editableProperty"
224 + #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
225 + data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
226 + data-property-type="object"#end>
227 + ## This must match the id generated by the $doc.display() method below.
228 + #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
229 + <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
230 + $escapetool.xml($property.translatedPrettyName)
231 + </label>
232 + ## Support for specifying a translation key as hint in the property definition.
233 + <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
234 + </dt>
235 + <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
178 178   #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>
198 198   #end
199 199   #if (!$xclass.properties || $xclass.properties.size() == 0)
200 200   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -215,7 +215,7 @@
215 215   />
216 216   </div>
217 217   <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
218 - <input type="hidden" name="sourcePage" value="$!{request.sourcePage}" />
257 + <input type="hidden" name="sourcePage" />
219 219   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
220 220   </form>
221 221   #end