Merge branch 'hotfix-3.3.2' into stable

pixl8 · Jul 12, 2022 · 26c523a · 26c523a
2 parents 9eb4afa + 1844a5e
commit 26c523a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.3.2
+
+* [#62](https://github.com/pixl8/preside-ext-data-api/issues/62)- Fix issues with bad content renderers for data with page links
+
 ## v3.3.1
 
 * [#61](https://github.com/pixl8/preside-ext-data-api/issues/61) - Fix bad i18n keys being used for documenting field descriptions

diff --git a/handlers/renderers/content/DataApiPageLink.cfc b/handlers/renderers/content/DataApiPageLink.cfc
@@ -6,5 +6,7 @@ component {
 		if ( pageId.len() ) {
 			return event.buildLink( page=pageId );
 		}
+
+		return "";
 	}
 }
diff --git a/handlers/renderers/content/DataApiPageLinkArray.cfc b/handlers/renderers/content/DataApiPageLinkArray.cfc
@@ -1,6 +1,6 @@
 component {
 
-	private string function default( event, rc, prc, args={} ){
+	private array function default( event, rc, prc, args={} ){
 		var pages = ListToArray( args.data ?: "" );
 
 		for( var i=1; i<=pages.len(); i++ ) {

diff --git a/services/DataApiService.cfc b/services/DataApiService.cfc
@@ -325,13 +325,19 @@ component {
 		}
 
 		if ( $getContentRendererService().rendererExists( renderer, "dataapi" ) ) {
-			var renderedContent = $renderContent( renderer, arguments.value, "dataapi", arguments.fieldSettings );
-			if ( Len( renderedContent ?: "" ) ) {
-				return renderedContent;
+			try {
+				var renderedContent = $renderContent( renderer, arguments.value, "dataapi", arguments.fieldSettings );
+				if ( Len( renderedContent ?: "" ) ) {
+					return renderedContent;
+				}
+			} catch( any e ) {
+				$raiseError( e );
 			}
-
 		}
 
+		if ( Len( arguments.value ?: "" ) ) {
+			return arguments.value;
+		}
 		return $isFeatureEnabled( "dataApiUseNullForStrings" )  ? NullValue() : "";
 	}