Merge branch 'feature-PRESIDECMS-912_addRecordAction-validation-resul…

…t' of https://github.com/sebduggan/Preside-CMS into hotfix-10.8.8
pixl8 · Jun 14, 2017 · 87c1214 · 87c1214
2 parents 6666e5a + b20cf58
commit 87c1214
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/system/handlers/admin/DataManager.cfc b/system/handlers/admin/DataManager.cfc
@@ -1643,6 +1643,7 @@
 		<cfargument name="draftsEnabled"           type="boolean" required="false" default="false" />
 		<cfargument name="canPublish"              type="boolean" required="false" default="false" />
 		<cfargument name="canSaveDraft"            type="boolean" required="false" default="false" />
+		<cfargument name="validationResult"        type="any"     required="false" />
 		<cfargument name="stripPermissionedFields" type="boolean" required="false" default="true" />
 		<cfargument name="permissionContext"       type="string"  required="false" default="#arguments.object#" />
 		<cfargument name="permissionContextKeys"   type="array"   required="false" default="#ArrayNew(1)#" />
@@ -1657,7 +1658,7 @@
 			var persist          = "";
 			var isDraft          = false;
 
-			validationResult = validateForm( formName=arguments.formName, formData=formData, stripPermissionedFields=arguments.stripPermissionedFields, permissionContext=arguments.permissionContext, permissionContextKeys=arguments.permissionContextKeys );
+			validationResult = validateForm( formName=arguments.formName, formData=formData, validationResult=( arguments.validationResult ?: NullValue() ), stripPermissionedFields=arguments.stripPermissionedFields, permissionContext=arguments.permissionContext, permissionContextKeys=arguments.permissionContextKeys );
 
 			if ( not validationResult.validated() ) {
 				messageBox.error( translateResource( "cms:datamanager.data.validation.error" ) );