Merge branch 'feature-PRESIDECMS-2964_recording-where-a-formbuilder-f…

…orm-has-been-submitted-from' into release-10.28.0
pixl8 · Dec 20, 2024 · 5eee010 · 5eee010
2 parents 91e07ea + 080148d
commit 5eee010
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 15 deletions.
diff --git a/system/handlers/formbuilder/Core.cfc b/system/handlers/formbuilder/Core.cfc
@@ -47,9 +47,11 @@ component {
 		}
 
 		var validationResult = formBuilderService.saveFormSubmission(
-			  formId      = formId
-			, requestData = submission
-			, instanceId  = ( rc.instanceId ?: "" )
+			  formId       = formId
+			, requestData  = submission
+			, instanceId   = ( rc.instanceId   ?: "" )
+			, instanceSite = ( rc.instanceSite ?: "" )
+			, instanceUrl  = ( rc.instanceUrl  ?: "" )
 		);
 
 		if ( event.isAjax() ) {

diff --git a/system/handlers/renderers/content/FormBuilderSubmissionFormUrl.cfc b/system/handlers/renderers/content/FormBuilderSubmissionFormUrl.cfc
@@ -0,0 +1,26 @@
+/**
+ * @feature formbuilder
+ */
+component  {
+
+	property name="formBuilderService" inject="SiteService";
+	property name="formBuilderService" inject="FormBuilderService";
+
+	private string function default( event, rc, prc, args={} ) {
+		if ( !isEmptyString( args.data ?: "" ) ) {
+			var submissionId = ( rc.submissionId ?: ( args.record.id ?: ( rc.id ?: "" ) ) );
+
+			var submission = formBuilderService.getSubmission( submissionId );
+
+			if ( !isEmptyString( submission.form_site ?: "" ) ) {
+
+				var link = event.getSiteUrl( submission.form_site ) & args.data;
+
+				return '<a href="#link#">#link#</a>';
+			}
+		}
+
+		return "";
+	}
+
+}
diff --git a/system/handlers/widgets/FormBuilderForm.cfc b/system/handlers/widgets/FormBuilderForm.cfc
@@ -64,6 +64,9 @@ component {
 				rendered &= '<div class="alert alert-info"><p>' & translateResource( "formbuilder:#resubmitMessage#") & '</p></div>';
 			}
 
+			args.instanceSite = args.instanceSite ?: event.getSiteId();
+			args.instanceUrl  = args.instanceUrl  ?: event.getCurrentUrl();
+
 			rendered &= formbuilderService.renderForm(
 				  formId           = formId
 				, layout           = layout

diff --git a/system/i18n/preside-objects/formbuilder_formsubmission.properties b/system/i18n/preside-objects/formbuilder_formsubmission.properties
@@ -5,5 +5,7 @@ field.submitted_by.title=Submitted by
 field.datecreated.title=Submitted on
 field.submitted_data.title=Response
 field.form_instance.title=Form instance
+field.form_site.title=Form site
+field.form_url.title=Form url
 field.ip_address.title=IP Address
 field.user_agent.title=User agent
diff --git a/system/preside-objects/formbuilder/formbuilder_formsubmission.cfc b/system/preside-objects/formbuilder/formbuilder_formsubmission.cfc
@@ -9,8 +9,12 @@ component displayname="Form builder: form" extends="preside.system.base.SystemPr
 	property name="form"         relationship="many-to-one" relatedto="formbuilder_form" required=true;
 	property name="submitted_by" relationship="many-to-one" relatedTo="website_user"     required=false renderer="websiteUser" ondelete="set-null-if-no-cycle-check" onupdate="cascade-if-no-cycle-check" feature="websiteUsers";
 
-	property name="submitted_data" type="string" dbtype="text"                  required=false  renderer="formbuilderSubmission";
-	property name="form_instance"  type="string" dbtype="varchar" maxlength=200 required=false;
-	property name="ip_address"     type="string" dbtype="varchar" maxlength=50  required=false;
-	property name="user_agent"     type="string" dbtype="text"                  required=false;
+	property name="submitted_data" type="string" dbtype="text" required=false renderer="formbuilderSubmission";
+
+	property name="form_instance" type="string" dbtype="varchar" maxlength=200 required=false;
+	property name="form_url"      type="string" dbtype="text"                  required=false renderer="formbuilderSubmissionFormUrl";
+	property name="form_site"     relationship="many-to-one" relatedTo="site"  required=false;
+
+	property name="ip_address" type="string" dbtype="varchar" maxlength=50 required=false;
+	property name="user_agent" type="string" dbtype="text"                 required=false;
 }
diff --git a/system/services/formbuilder/FormBuilderService.cfc b/system/services/formbuilder/FormBuilderService.cfc
@@ -1023,9 +1023,11 @@ component {
 	public any function saveFormSubmission(
 		  required string formId
 		, required struct requestData
-		,          string instanceId  = ""
-		,          string ipAddress   = Trim( ListLast( cgi.remote_addr ?: "" ) )
-		,          string userAgent   = ( cgi.http_user_agent ?: "" )
+		,          string instanceId   = ""
+		,          string instanceSite = ""
+		,          string instanceUrl  = ""
+		,          string ipAddress    = Trim( ListLast( cgi.remote_addr ?: "" ) )
+		,          string userAgent    = ( cgi.http_user_agent ?: "" )
 	) {
 		setFormBuilderSubmissionContextData( arguments.formId, arguments.requestData );
 
@@ -1056,20 +1058,26 @@ component {
 		if ( validationResult.validated() ) {
 			if ( isV2Form( arguments.formid ) ) {
 				submissionId = $getPresideObject( "formbuilder_formsubmission" ).insertData( data={
-					  form           = arguments.formId
-					, submitted_by   = $getWebsiteLoggedInUserId()
-					, form_instance  = arguments.instanceId
-					, ip_address     = arguments.ipAddress
-					, user_agent     = arguments.userAgent
+					  form          = arguments.formId
+					, submitted_by  = $getWebsiteLoggedInUserId()
+					, form_instance = arguments.instanceId
+					, form_site     = arguments.instanceSite
+					, form_url      = arguments.instanceUrl
+					, ip_address    = arguments.ipAddress
+					, user_agent    = arguments.userAgent
 				} );
+
 				saveV2Responses( formId=arguments.formId, formData=formData, formItems=formItems, submissionId=submissionId );
 			} else {
 				formData = renderResponsesForSaving( formId=arguments.formId, formData=formData, formItems=formItems );
+
 				submissionId = $getPresideObject( "formbuilder_formsubmission" ).insertData( data={
 					  form           = arguments.formId
 					, submitted_by   = $getWebsiteLoggedInUserId()
 					, submitted_data = SerializeJson( formData )
 					, form_instance  = arguments.instanceId
+					, form_site      = arguments.instanceSite
+					, form_url       = arguments.instanceUrl
 					, ip_address     = arguments.ipAddress
 					, user_agent     = arguments.userAgent
 				} );

diff --git a/system/views/admin/formbuilder/viewSubmission.cfm b/system/views/admin/formbuilder/viewSubmission.cfm
@@ -18,6 +18,9 @@
 			<dt>#translateResource( "preside-objects.formbuilder_formsubmission:field.form_instance.title")#</dt>
 			<dd>#renderField( 'formbuilder_formsubmission', 'form_instance', prc.submission.form_instance )#</dd>
 
+			<dt>#translateResource( "preside-objects.formbuilder_formsubmission:field.form_url.title")#</dt>
+			<dd>#renderField( 'formbuilder_formsubmission', 'form_url', prc.submission.form_url )#</dd>
+
 			<dt>#translateResource( "preside-objects.formbuilder_formsubmission:field.ip_address.title")#</dt>
 			<dd>#renderField( 'formbuilder_formsubmission', 'ip_address', prc.submission.ip_address )#</dd>