Merge branch 'hotfix-10.6.9' into stable

pixl8 · Jul 27, 2016 · 05554aa · 05554aa
2 parents 322e064 + 7bb521b
commit 05554aa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.6.8",
+    "version":"10.6.9",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/box.json.no.deps b/box.json.no.deps
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.6.8",
+    "version":"10.6.9",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/support/build/build.properties b/support/build/build.properties
@@ -2,5 +2,5 @@ build.number.remote.url=http://downloads.presidecms.com/presidecms/build.number
 
 ##############################
 # MANUALLY UPDATE EACH VERSION
-preside.version=10.6.8
+preside.version=10.6.9
 ##############################
diff --git a/system/handlers/admin/DataManager.cfc b/system/handlers/admin/DataManager.cfc
@@ -1599,10 +1599,12 @@
 		<cfargument name="rc"                type="struct"  required="true" />
 		<cfargument name="prc"               type="struct"  required="true" />
 		<cfargument name="object"            type="string"  required="false" default="#( rc.object ?: '' )#" />
+		<cfargument name="recordId"          type="string"  required="false" default="#( rc.id     ?: '' )#" />
 		<cfargument name="errorAction"       type="string"  required="false" default="" />
-		<cfargument name="errorUrl"          type="string"  required="false" default="#( errorAction.len() ? event.buildAdminLink( linkTo=errorAction ) : event.buildAdminLink( linkTo="datamanager.object", querystring="id=#object#" ) )#" />
+		<cfargument name="errorUrl"          type="string"  required="false" default="#( errorAction.len() ? event.buildAdminLink( linkTo=errorAction ) : event.buildAdminLink( linkTo="datamanager.editRecord", querystring="object=#arguments.object#&id=#arguments.recordId#" ) )#" />
+		<cfargument name="missingUrl"        type="string"  required="false" default="#event.buildAdminLink( linkTo="datamanager.object", querystring="id=#arguments.object#" )#" />
 		<cfargument name="successAction"     type="string"  required="false" default="" />
-		<cfargument name="successUrl"        type="string"  required="false" default="#( successAction.len() ? event.buildAdminLink( linkTo=successAction, queryString='id=' & id ) : event.buildAdminLink( linkTo="datamanager.object", querystring="id=#object#" ) )#" />
+		<cfargument name="successUrl"        type="string"  required="false" default="#( successAction.len() ? event.buildAdminLink( linkTo=successAction, queryString='id=' & id ) : 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.#object#.admin.edit" />
 		<cfargument name="mergeWithFormName" type="string"  required="false" default="" />
@@ -1621,7 +1623,7 @@
 			if ( not presideObjectService.dataExists( objectName=object, filter={ id=id } ) ) {
 				messageBox.error( translateResource( uri="cms:datamanager.recordNotFound.error", data=[ LCase( objectName ) ] ) );
 
-				setNextEvent( url=errorUrl );
+				setNextEvent( url=missingUrl );
 			}
 
 			formData.id = id;
@@ -1632,7 +1634,7 @@
 				persist = formData;
 				persist.validationResult = validationResult;
 
-				setNextEvent( url=errorUrl );
+				setNextEvent( url=errorUrl, persistStruct=persist );
 			}
 
 			presideObjectService.updateData( objectName=object, data=formData, id=id, updateManyToManyRecords=true );

diff --git a/system/services/presideObjects/VersioningService.cfc b/system/services/presideObjects/VersioningService.cfc
@@ -195,7 +195,7 @@ component output=false singleton=true {
 
 			var isManyToManyField = ( properties[ field ].relationship ?: "" ) == "many-to-many";
 			if ( isManyToManyField ) {
-				if ( StructKeyExists( oldManyToManyData, field ) && oldManyToManyData[ field ] != arguments.newData[ field ] ) {
+				if ( StructKeyExists( oldManyToManyData, field ) && Compare( oldManyToManyData[ field ], arguments.newData[ field ] ) ) {
 					changedFields.append( field );
 				}
 			} else {
@@ -205,7 +205,7 @@ component output=false singleton=true {
 						arguments.newData[ field ] = 0;
 					}
 				}
-				if ( StructKeyExists( oldData, field ) && oldData[ field ] != ( arguments.newData[ field ] ?: "" ) ) {
+				if ( StructKeyExists( oldData, field ) && Compare( oldData[ field ], arguments.newData[ field ] ?: "" ) ) {
 					changedFields.append( field );
 				}
 			}