Merge branch 'sebduggan-feature-PRESIDECMS-1052_mergeForm-argument-in…

…-datamanager-addrecordaction' into stable
pixl8 · Oct 26, 2017 · 9827d39 · 9827d39
2 parents 93ef777 + 9da222f
commit 9827d39
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/system/handlers/admin/DataManager.cfc b/system/handlers/admin/DataManager.cfc
@@ -1643,6 +1643,7 @@
 		<cfargument name="successUrl"              type="string"  required="false" default="#( successAction.len() ? event.buildAdminLink( linkTo=successAction, queryString='id={newid}' ) : event.buildAdminLink( linkTo="datamanager.object", querystring="id=#arguments.object#" ) )#" />
 		<cfargument name="redirectOnSuccess"       type="boolean" required="false" default="true" />
 		<cfargument name="formName"                type="string"  required="false" default="preside-objects.#arguments.object#.admin.add" />
+		<cfargument name="mergeWithFormName"       type="string"  required="false" default="" />
 		<cfargument name="audit"                   type="boolean" required="false" default="false" />
 		<cfargument name="auditAction"             type="string"  required="false" default="" />
 		<cfargument name="auditType"               type="string"  required="false" default="datamanager" />
@@ -1655,6 +1656,7 @@
 		<cfargument name="permissionContextKeys"   type="array"   required="false" default="#ArrayNew(1)#" />
 
 		<cfscript>
+			arguments.formName = Len( Trim( arguments.mergeWithFormName ) ) ? formsService.getMergedFormName( arguments.formName, arguments.mergeWithFormName ) : arguments.formName;
 			var formData         = event.getCollectionForForm( formName=arguments.formName, stripPermissionedFields=arguments.stripPermissionedFields, permissionContext=arguments.permissionContext, permissionContextKeys=arguments.permissionContextKeys );
 			var labelField       = presideObjectService.getObjectAttribute( object, "labelfield", "label" );
 			var obj              = "";