Merge branch 'hotfix-10.27.29' into stable

DominicWatson · DominicWatson · commit 96be038338f1 · 2025-01-29T12:48:22.000Z
diff --git a/system/base/EnhancedDataManagerBase.cfc b/system/base/EnhancedDataManagerBase.cfc
@@ -319,7 +319,7 @@ component extends="preside.system.base.AdminHandler" {
 
 			args.tabs[ i ] = {
 				  id        = tabId
-				, iconClass = translateResource( uri=i18nBase & "viewtab.#tabId#.iconclass", defaultValue=translateResource( i18nDefaultBase & "viewtab.#tabId#.iconclass" ) )
+				, iconClass = translateResource( uri=i18nBase & "viewtab.#tabId#.iconclass", defaultValue=translateResource( uri=i18nDefaultBase & "viewtab.#tabId#.iconclass", defaultValue="" ) )
 				, content   = customizationService.runCustomization( objectName=objectName, action="_#tabId#Tab", args=args )
 				, title     = customizationService.runCustomization( objectName=objectName, action="_#tabId#TabTitle", args=args, defaultResult=translateResource( uri=i18nBase & "viewtab.#tabId#.title", defaultValue=translateResource( i18nDefaultBase & "viewtab.#tabId#.title" ) ) )
 			};
diff --git a/system/handlers/admin/datamanager/rules_engine_condition.cfc b/system/handlers/admin/datamanager/rules_engine_condition.cfc
@@ -45,7 +45,7 @@ component extends="preside.system.base.AdminHandler" {
 	private boolean function checkPermission( event, rc, prc, args={} ) {
 		var objectName = "rules_engine_condition";
 
-		if ( Len( Trim( rc.filterobject ?: "" ) ) ) {
+		if ( Len( Trim( rc.filterobject ?: "" ) ) && ( rc.filterobject != "rules_engine_condition" ) ) {
 			_checkProxyPermissionForObjectFilters( argumentCollection=arguments );
 		}
 
@@ -257,7 +257,7 @@ component extends="preside.system.base.AdminHandler" {
 		var operationSource = event.getAdminOperationSource();
 		var filterObject    = prc.record.filter_object ?: ( rc.filterObject ?: "" );
 
-		if ( Len( filterObject ) && ( operationSource == "manageObjectFilters" || operationSource == "manageSegmentationFilters" ) ) {
+		if ( Len( filterObject ) && ( filterObject != "rules_engine_condition" ) && ( operationSource == "manageObjectFilters" || operationSource == "manageSegmentationFilters" ) ) {
 			customizationService.runCustomization(
 				  objectName     = filterObject
 				, action         = "objectBreadcrumb"
diff --git a/system/services/frontendEditing/FrontendEditingService.cfc b/system/services/frontendEditing/FrontendEditingService.cfc
@@ -21,11 +21,18 @@ component {
 		var poService = $getPresideObjectService();
 
 		if ( poService.isPageType( arguments.object ) || arguments.object == "page" ) {
-			return _getSiteTreeService().editPage(
-				  id           = arguments.recordId
-				, isDraft      = true
-				, "#property#" = arguments.content
-			);
+			try {
+				_getSiteTreeService().editPage(
+					  id           = arguments.recordId
+					, isDraft      = true
+					, "#property#" = arguments.content
+				);
+			} catch (any e) {
+				$raiseError(e);
+				return false;
+			}
+
+			return true;
 		}
 
 		var result = poService.updateData(
diff --git a/system/services/presideObjects/RelationshipGuidance.cfc b/system/services/presideObjects/RelationshipGuidance.cfc
@@ -461,7 +461,7 @@ component singleton=true {
 				case "select-data-view":
 					join.append({
 						  selectDataView = relationship.selectDataView
-						, subQueryAlias  = relationship.alias
+						, subQueryAlias  = joinAlias
 						, subQueryColumn = relationship.pk
 						, joinToTable    = Len( currentAlias ) ? currentAlias : currentSource
 						, joinToColumn   = relationship.fk
diff --git a/system/services/siteTree/SiteTreeService.cfc b/system/services/siteTree/SiteTreeService.cfc
@@ -847,6 +847,10 @@ component {
 				pageTypeDataHasChanged = _getVersioningService().dataHasChanged( objectName=pageType.getPresideObject(), recordId=arguments.id, newData=arguments );
 			}
 
+			if ( !pageDataHasChanged && !pageTypeDataHasChanged ) {
+				return updated;
+			}
+
 			updated = pobj.updateData(
 				  data                    = data
 				, id                      = arguments.id
diff --git a/system/views/admin/datamanager/_tabs.cfm b/system/views/admin/datamanager/_tabs.cfm
@@ -28,7 +28,9 @@
 				</cfif>
 				<li<cfif tab.id eq activeTab> class="active"</cfif>>
 					<a href="##tab-#tab.id#" data-toggle="tab" >
-						<i class="fa fa-fw #tab.iconClass#" title="#HtmlEditFormat( tab.title )#"></i>&nbsp;
+						<cfif Len( tab.iconClass )>
+							<i class="fa fa-fw #tab.iconClass#" title="#HtmlEditFormat( tab.title )#"></i>&nbsp;
+						</cfif>
 
 						<span class="hidden-xs">
 							#tab.title#
diff --git a/tests/index.cfm b/tests/index.cfm
@@ -54,11 +54,11 @@
 
 		<p>Quick test excludes the following long-running tests. Click to run them individually:</p>
 			<ul>
-				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=integration.api.admin.AuditServiceTest">admin.AuditServiceTest</a></li>
-				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=integration.api.admin.LoginServiceTest">admin.LoginServiceTest</a></li>
-				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=integration.api.presideObjects.PresideObjectServiceTest">presideObjects.PresideObjectServiceTest</a></li>
-				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=integration.api.security.CsrfProtectionServiceTest">security.CsrfProtectionServiceTest</a></li>
-				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=integration.api.sitetree.SiteServiceTest">sitetree.SiteServiceTest</a></li>
+				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=unit.api.admin.AuditServiceTest">admin.AuditServiceTest</a></li>
+				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=unit.api.admin.LoginServiceTest">admin.LoginServiceTest</a></li>
+				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=unit.api.presideObjects.PresideObjectServiceTest">presideObjects.PresideObjectServiceTest</a></li>
+				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=unit.api.security.CsrfProtectionServiceTest">security.CsrfProtectionServiceTest</a></li>
+				<li><a href="runtests.cfm?method=runRemote&directory=&testBundles=unit.api.sitetree.SiteServiceTest">sitetree.SiteServiceTest</a></li>
 			</ul>
 		</p>
 	</section>
diff --git a/tests/resources/HelperObjects/PresideTestCase.cfc b/tests/resources/HelperObjects/PresideTestCase.cfc
@@ -51,6 +51,7 @@
 		<cfargument name="coldbox"                   type="any"     required="false" />
 		<cfargument name="msSqlUseVarcharMaxForText" type="boolean" required="false" default="false" />
 		<cfargument name="throwOnLongTableName"      type="boolean" required="false" default="false" />
+		<cfargument name="delayInit"                 type="boolean" required="false" default="false" />
 
 		<cfscript>
 			var key = "_presideObjectService" & Hash( SerializeJson( arguments ) );
@@ -87,7 +88,7 @@
 				);
 				var relationshipGuidance = new preside.system.services.presideObjects.relationshipGuidance(
 					  objectReader = objReader
-					, selectDataViewService = createStub()
+					, selectDataViewService = arguments.selectDataViewService
 				);
 				var presideObjectDecorator = new preside.system.services.presideObjects.presideObjectDecorator();
 
@@ -129,7 +130,6 @@
 					, reloadDb               = false
 					, throwOnLongTableName   = arguments.throwOnLongTableName
 				);
-				request[ key ].postInit();
 
 				request[ key ] = getMockbox().createMock( object=request[ key ] );
 
@@ -141,6 +141,10 @@
 				request[ key ].$( "$getColdbox", coldbox );
 				mockRequestContext.$( "showNonLiveContent", false );
 				coldbox.$( "handlerExists", false );
+
+				if ( !arguments.delayInit ) {
+					request[ key ].postInit();
+				}
 			}
 
 			request[ '_mostRecentPresideObjectFetch' ] = request[ key ];
diff --git a/tests/resources/PresideObjectService/objectsWithNestedSelectDataViews/object_a.cfc b/tests/resources/PresideObjectService/objectsWithNestedSelectDataViews/object_a.cfc
@@ -0,0 +1,3 @@
+<cfcomponent output="false" versioned="false">
+	<cfproperty name="object_bs" relationship="one-to-many" relatedto="object_b" relationshipKey="object_a" />
+</cfcomponent>
diff --git a/tests/resources/PresideObjectService/objectsWithNestedSelectDataViews/object_b.cfc b/tests/resources/PresideObjectService/objectsWithNestedSelectDataViews/object_b.cfc
@@ -0,0 +1,4 @@
+<cfcomponent output="false" versioned="false">
+	<cfproperty name="object_a"  relationship="many-to-one" relatedto="object_a" />
+	<cfproperty name="object_cs" relationship="one-to-many" relatedto="object_c" relationshipKey="object_b" />
+</cfcomponent>
diff --git a/tests/resources/PresideObjectService/objectsWithNestedSelectDataViews/object_c.cfc b/tests/resources/PresideObjectService/objectsWithNestedSelectDataViews/object_c.cfc
@@ -0,0 +1,4 @@
+<cfcomponent output="false" versioned="false">
+	<cfproperty name="object_b"  relationship="many-to-one"      relatedTo="object_b" />
+	<cfproperty name="object_ds" relationship="select-data-view" relatedTo="viewObjectD" relationshipKey="object_c" />
+</cfcomponent>
diff --git a/tests/resources/PresideObjectService/objectsWithNestedSelectDataViews/object_d.cfc b/tests/resources/PresideObjectService/objectsWithNestedSelectDataViews/object_d.cfc
@@ -0,0 +1,4 @@
+<cfcomponent output="false" versioned="false">
+	<cfproperty name="object_c" type="string"  sqltype="varchar" />
+	<cfproperty name="value"    type="numeric" sqltype="int" />
+</cfcomponent>
diff --git a/tests/unit/api/presideObjects/PresideObjectServiceTest.cfc b/tests/unit/api/presideObjects/PresideObjectServiceTest.cfc
@@ -3914,11 +3914,11 @@
 			bIds.append( poService.insertData( objectName="object_b", data={ label="b 2", lots_of_a="#aIds[2]#" }, insertManyToManyRecords=true ) );
 			cIds.append( poService.insertData( objectName="object_c", data={ label="c 1", obj_b=bIds[1] } ) );
 			cIds.append( poService.insertData( objectName="object_c", data={ label="c 2", obj_b=bIds[2] } ) );
-			
+
 			var queryA = poService.selectData(
 				  objectName          = "object_a"
 				, filter              = { label = "a 1" }
-				, selectFields        = [ "id" ] 
+				, selectFields        = [ "id" ]
 				, getSqlAndParamsOnly = true
 				, formatSqlParams     = true
 			);
@@ -3929,14 +3929,14 @@
 				, extraFilters        = [ {
 					filter = sqlRunner.obfuscateSqlForPreside( "exists (#queryA.sql#) " )
 				} ]
-				, selectFields        = [ "id" ] 
+				, selectFields        = [ "id" ]
 				, getSqlAndParamsOnly = true
 				, formatSqlParams     = true
 			);
 
 			var params = queryA.params;
 			StructAppend( params, queryB.params, true );
-			
+
 			var queryWithParams = poService.selectData(
 				  objectName         = "object_c"
 				, selectFields       = [ "id" ]
@@ -3952,18 +3952,91 @@
 		</cfscript>
 	</cffunction>
 
+	<cffunction name="test111_selectData_shouldWorkWithDeepNestedSelectDataViews" returntype="void">
+		<cfscript>
+			var poService = _getService(
+				  objectDirectories = [ "/tests/resources/PresideObjectService/objectsWithNestedSelectDataViews" ]
+				, delayInit         = true
+			);
+			var sqlRunner = CreateMock( object=new preside.system.services.database.SqlRunner(
+				logger = _getTestLogger()
+			) );
+
+			mockSelectDataViewService.$( "getViewArgs", {
+				  objectname   = "object_d"
+				, selectFields = [ "object_c", "sum( value ) as total_value" ]
+				, groupBy      = "object_c"
+			} );
+			mockSelectDataViewService.$( "$getPresideObjectService", poService );
+			poService.postInit();
+
+			var aIds = [];
+			var bIds = [];
+			var cIds = [];
+			var dIds = [];
+
+			poService.dbSync();
+
+			ArrayAppend( aIds, poService.insertData( objectName="object_a", data={ label="a 1" } ) );
+			ArrayAppend( aIds, poService.insertData( objectName="object_a", data={ label="a 2" } ) );
+			ArrayAppend( aIds, poService.insertData( objectName="object_a", data={ label="a 3" } ) );
+			ArrayAppend( bIds, poService.insertData( objectName="object_b", data={ label="b 1", object_a=aIds[1] } ) );
+			ArrayAppend( bIds, poService.insertData( objectName="object_b", data={ label="b 2", object_a=aIds[2] } ) );
+			ArrayAppend( bIds, poService.insertData( objectName="object_b", data={ label="b 3", object_a=aIds[3] } ) );
+			ArrayAppend( cIds, poService.insertData( objectName="object_c", data={ label="c 1", object_b=bIds[1] } ) );
+			ArrayAppend( cIds, poService.insertData( objectName="object_c", data={ label="c 2", object_b=bIds[2] } ) );
+			ArrayAppend( cIds, poService.insertData( objectName="object_c", data={ label="c 3", object_b=bIds[3] } ) );
+			ArrayAppend( cIds, poService.insertData( objectName="object_c", data={ label="c 4", object_b=bIds[3] } ) );
+
+			ArrayAppend( dIds, poService.insertData( objectName="object_d", data={ label="d 1", object_c=cIds[1], value=5 } ) );
+			ArrayAppend( dIds, poService.insertData( objectName="object_d", data={ label="d 2", object_c=cIds[1], value=9 } ) );
+			ArrayAppend( dIds, poService.insertData( objectName="object_d", data={ label="d 3", object_c=cIds[2], value=8 } ) );
+			ArrayAppend( dIds, poService.insertData( objectName="object_d", data={ label="d 4", object_c=cIds[2], value=4 } ) );
+			ArrayAppend( dIds, poService.insertData( objectName="object_d", data={ label="d 5", object_c=cIds[3], value=3 } ) );
+			ArrayAppend( dIds, poService.insertData( objectName="object_d", data={ label="d 6", object_c=cIds[3], value=1 } ) );
+			ArrayAppend( dIds, poService.insertData( objectName="object_d", data={ label="d 7", object_c=cIds[4], value=15 } ) );
+			ArrayAppend( dIds, poService.insertData( objectName="object_d", data={ label="d 8", object_c=cIds[4], value=10 } ) );
+
+			var queryA = poService.selectData(
+				  objectName   = "object_a"
+				, selectFields = [ "object_a.label", "object_bs$object_cs$object_ds.total_value" ]
+				, filter       = { "object_a.id" = aIds[1] }
+			);
+
+			var queryB = poService.selectData(
+				  objectName   = "object_a"
+				, selectFields = [ "object_a.label", "object_bs$object_cs$object_ds.total_value" ]
+				, filter       = { "object_a.id" = aIds[2] }
+			);
+
+			var queryC = poService.selectData(
+				  objectName   = "object_a"
+				, selectFields = [ "object_a.label", "object_bs$object_cs$object_ds.total_value" ]
+				, filter       = { "object_a.id" = aIds[3] }
+			);
+
+			super.assertEquals( queryA.total_value, 14, "Expected total value mismatch" );
+			super.assertEquals( queryB.total_value, 12, "Expected total value mismatch" );
+			super.assertEquals( queryC.recordCount, 2, "Expected record count mismatch" );
+			super.assertEquals( ArraySum( QueryColumnData( queryC, "total_value" ) ), 29, "Expected total value mismatch" );
+		</cfscript>
+	</cffunction>
+
 <!--- private helpers --->
 	<cffunction name="_getService" access="private" returntype="any" output="false">
 		<cfargument name="objectDirectories"    type="array"   required="true" />
 		<cfargument name="defaultPrefix"        type="string"  required="false" default="ptest_" />
 		<cfargument name="throwOnLongTableName" type="boolean" required="false" />
+		<cfargument name="delayInit"            type="boolean" required="false" />
 
 		<cfscript>
 			cachebox                  = _getCachebox( forceNewInstance = true );
 			mockColdbox               = getMockbox().createEmptyMock( "preside.system.coldboxModifications.Controller" );
 			mockColdboxEvent          = getMockbox().createStub();
 			mockInterceptorService    = _getMockInterceptorService();
-			mockSelectDataViewService = getMockbox().createEmptyMock( "preside.system.services.presideObjects.PresideObjectSelectDataViewService" );
+
+			var selectDataViewService = new preside.system.services.presideObjects.PresideObjectSelectDataViewService();
+			mockSelectDataViewService = getMockbox().prepareMock( selectDataViewService );
 
 			mockColdboxEvent.$( "isAdminUser", true );
 			mockColdboxEvent.$( "getAdminUserId", "" );
@@ -3978,6 +4051,7 @@
 				, interceptorService    = mockInterceptorService
 				, selectDataViewService = mockSelectDataViewService
 				, throwOnLongTableName  = arguments.throwOnLongTableName ?: false
+				, delayInit             = arguments.delayInit
 			)
 		</cfscript>
 	</cffunction>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<cfcomponent output="false" versioned="false">`
	`2`	`+ <cfproperty name="object_bs" relationship="one-to-many" relatedto="object_b" relationshipKey="object_a" />`
	`3`	`+</cfcomponent>`