Merge branch 'hotfix-10.7.18' into stable

pixl8 · Jan 10, 2017 · 245c200 · 245c200
2 parents c9774db + dc8eec6
commit 245c200
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 11 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.17",
+    "version":"10.7.18",
     "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.7.17",
+    "version":"10.7.18",
     "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.7.17
+preside.version=10.7.18
 ##############################
diff --git a/support/tests/integration/api/presideObjects/PresideObjectServiceTest.cfc b/support/tests/integration/api/presideObjects/PresideObjectServiceTest.cfc
@@ -1476,6 +1476,8 @@
 			q.execute();
 			q.setSQL( "insert into ptest_object_d ( object_e, label, datemodified, datecreated) values ( 'TEST-UUID', 'test2', #_getNowSql()#, #_getNowSql()# )" );
 			q.execute();
+			q.setSQL( "insert into ptest_object_g ( object_e, datemodified, datecreated) values ('TEST-UUID', #_getNowSql()#, #_getNowSql()# )" );
+			q.execute();
 
 			result = poService.listForeignObjectsBlockingDelete(
 				  objectName   = "object_e"

diff --git a/...tests/resources/PresideObjectService/componentsWithAutoJoinableRelationships/object_g.cfc b/...tests/resources/PresideObjectService/componentsWithAutoJoinableRelationships/object_g.cfc
@@ -0,0 +1,4 @@
+<cfcomponent output="false" versioned="false" nolabel="true">
+	<cfproperty name="id" dbtype="int" maxlength="0" generator="increment" />
+	<cfproperty name="object_e" relationship="many-to-one" required="false" onupdate="cascade-if-no-cycle-check" />
+</cfcomponent>
diff --git a/system/handlers/admin/DataManager.cfc b/system/handlers/admin/DataManager.cfc
@@ -1759,7 +1759,7 @@
 		<cfargument name="prc"               type="struct"  required="true" />
 		<cfargument name="object"            type="string"  required="false" default="#( rc.object ?: '' )#" />
 		<cfargument name="postAction"        type="string"  required="false" default="datamanager.object" />
-		<cfargument name="postActionUrl"     type="string"  required="false" default="#( event.buildAdminLink( linkTo=postAction, queryString=( postAction=="datamanager.object" ? "id=#object#" : "" ) ) )#" />
+		<cfargument name="postActionUrl"     type="string"  required="false" default="#( rc.postActionUrl ?: ( event.buildAdminLink( linkTo=postAction, queryString=( postAction=="datamanager.object" ? "id=#object#" : "" ) ) ) )#" />
 		<cfargument name="redirectOnSuccess" type="boolean" required="false" default="true" />
 		<cfargument name="audit"             type="boolean" required="false" default="false" />
 		<cfargument name="auditAction"       type="string"  required="false" default="datamanager_delete_record" />
@@ -1790,7 +1790,7 @@
 				blockers = presideObjectService.listForeignObjectsBlockingDelete( object, ids );
 
 				if ( ArrayLen( blockers ) ) {
-					setNextEvent( url=event.buildAdminLink( linkTo="datamanager.cascadeDeletePrompt", queryString="object=#object#&postAction=#postAction#" ), persistStruct={ blockers = blockers, id=ArrayToList(ids) } );
+					setNextEvent( url=event.buildAdminLink( linkTo="datamanager.cascadeDeletePrompt", queryString="object=#object#" ), persistStruct={ blockers = blockers, id=ArrayToList(ids), postActionUrl=postActionUrl } );
 				}
 			} else {
 				try {

diff --git a/system/services/presideObjects/PresideObjectService.cfc b/system/services/presideObjects/PresideObjectService.cfc
@@ -1213,7 +1213,7 @@ component displayName="Preside Object Service" {
 
 		for( foreignObjName in joins ){
 			for( join in joins[ foreignObjName ] ) {
-				if ( join.type == "one-to-many" && join.ondelete !== "cascade" ) {
+				if ( join.type == "one-to-many" && join.ondelete == "error" ) {
 					filter = { "#join.fk#" = arguments.recordId };
 					recordCount = selectData( objectName=foreignObjName, selectFields=["count(*) as record_count"], filter=filter, useCache=false ).record_count;
 

diff --git a/system/views/admin/datamanager/cascadeDeletePrompt.cfm b/system/views/admin/datamanager/cascadeDeletePrompt.cfm
@@ -1,13 +1,16 @@
 <cfscript>
-	objectName          = event.getValue( name="object", defaultValue="" );
-	id                     = event.getValue( name="id", defaultValue="", private=true );
-	blockers               = event.getValue( name="blockers", defaultValue=[], private=true );
+	objectName          = rc.object        ?: "";
+	id                  = prc.id           ?: "";
+	blockers            = prc.blockers     ?: [];
+	postActionUrl       = Trim( rc.postActionUrl ?: "" );
 	objectTitleSingular = translateResource( uri="preside-objects.#objectName#:title.singular", defaultValue=objectName );
 	objectTitlePural    = translateResource( uri="preside-objects.#objectName#:title", defaultValue=objectName );
-	deleteTitle            = translateResource( uri="cms:datamanager.cascadeDelete.title" );
+	deleteTitle         = translateResource( uri="cms:datamanager.cascadeDelete.title" );
 
 	prc.pageIcon  = "trash";
 	prc.pageTitle = deleteTitle;
+
+	cancelLink = postActionUrl.len() ? postActionUrl : event.buildAdminLink( linkTo="datamanager.object", queryString="id=#objectName#" );
 </cfscript>
 
 <cfoutput>
@@ -39,7 +42,7 @@
 					#translateResource( uri="cms:datamanager.cascadeDelete.options.title" )#
 				</h4>
 
-				<a class="inline" href="#event.buildAdminLink( linkTo="datamanager.object", queryString="id=#objectName#" )#">
+				<a class="inline" href="#cancelLink#">
 					<button class="btn btn-primary btn-sm">
 						<i class="fa fa-arrow-left"></i>
 						#translateResource( uri="cms:datamanager.cascadeDelete.cancel.btn" )#
@@ -50,6 +53,9 @@
 					<input type="hidden" name="object" value="#objectName#" />
 					<input type="hidden" name="id" value="#id#" />
 					<input type="hidden" name="forceDelete" value="1" />
+					<cfif postActionUrl.len()>
+						<input type="hidden" name="postActionUrl" value="#HtmlEditFormat( postActionUrl )#" />
+					</cfif>
 
 					<button type="submit" class="btn btn-danger btn-sm confirmation-prompt" title="#translateResource( 'cms:datamanager.cascadeDelete.final.warning' )#">
 						<i class="fa fa-trash-o"></i>