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

From version 18.14
edited by Alex Cotiuga
on 2026/07/09 20:12
Change comment: There is no comment for this version
To version 18.27
edited by Alex Cotiuga
on 2026/07/09 21:01
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,56 @@
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 ($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
140 140   #set ($statusCode = 200)
141 141   #set ($message = 'Your request was successfully sent.')
142 142   #end
... ... @@ -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"')
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>
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}" />
264 + <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
XWiki.JavaScriptExtension[1]
cache
... ... @@ -1,0 +1,1 @@
1 +long
code
... ... @@ -1,0 +1,32 @@
1 +require(['jquery'], function ($) {
2 + $(function () {
3 + var sourcePageField = $('input[name="sourcePage"]');
4 +
5 + if (!sourcePageField.length || sourcePageField.val()) {
6 + return;
7 + }
8 +
9 + if (!document.referrer) {
10 + return;
11 + }
12 +
13 + try {
14 + var referrerUrl = new URL(document.referrer);
15 +
16 + if (referrerUrl.origin !== window.location.origin) {
17 + return;
18 + }
19 +
20 + var sourcePage = referrerUrl.pathname
21 + .replace(/^\/bin\//, '')
22 + .replace(/\/$/, '')
23 + .replace(/\//g, '.');
24 +
25 + if (sourcePage) {
26 + sourcePageField.val(sourcePage);
27 + }
28 + } catch (e) {
29 + // Ignore invalid referrer values.
30 + }
31 + });
32 +});
name
... ... @@ -1,0 +1,1 @@
1 +document referrer catcher
use
... ... @@ -1,0 +1,1 @@
1 +currentPage