issue #14 resolved

stevewithington · Aug 30, 2014 · fd2f066 · fd2f066
1 parent d857690
commit fd2f066
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/cfc/EventHandler.cfc b/cfc/EventHandler.cfc
@@ -49,7 +49,6 @@ component extends="mura.plugin.pluginGenericEventHandler" accessors=true output=
 		var local = {};
 		set$(arguments.$);
 		local.isMobile = getIsMobile();
-		local.body = get$().setDynamicContent($.content('body'));
 		local.image = get$().getURLForImage(
 			fileid = get$().content('fileid')
 			, size = 'small'
@@ -179,7 +178,12 @@ component extends="mura.plugin.pluginGenericEventHandler" accessors=true output=
 	public any function onFolderMuraLocationsMapBodyRender(required struct $) output=false {
 		var local = {};
 		set$(arguments.$);
-		local.body = get$().setDynamicContent(get$().content('body'));
+		local.body = get$().renderEditableAttribute(
+			attribute='body'
+			, type='HTMLEditor'
+			, label='Content'
+			, enableMuraTag=true
+		);
 		return local.body & dspLocationsMap(
 			mapType = get$().content('mapType')
 			, displayDirections = get$().content('displayDirections')
@@ -501,20 +505,20 @@ component extends="mura.plugin.pluginGenericEventHandler" accessors=true output=
 		local.fBean.setNextN(10000); // max locations to display
 		local.fBean.setShowNavOnly(true); // set to false to include content even if it's not in the navigation
 
-		// If we're on a Folder (formerly Portal): Mura/Location, then check to see if we only want to display children of this Folder...otherwise, we'll include all locations.
+		// If we're on a Folder (formerly Portal): Folder/MuraLocationMap, then check to see if we only want to display children of this Folder...otherwise, we'll include all locations.
 		if ( 
 			ListFindNoCase('Portal,Folder', local.cBean.getValue('type')) 
 			&& ListFindNoCase('MuraLocation,MuraLocationsMap', local.cBean.getValue('subtype'))
 			&& YesNoFormat(local.cBean.getValue('showChildrenOnly')) 
 		) {
-			local.fBean.addAdvancedParam(
+			local.fBean.addParam(
 				relationship='AND'
 				, field='tcontent.parentid'
 				, condition='EQ'
 				, criteria=local.cBean.getValue('contentid')
 			);
 		} else if ( Len(arguments.contentid) ) {
-			local.fBean.addAdvancedParam(
+			local.fBean.addParam(
 				relationship='AND'
 				, field='tcontent.path'
 				, condition='CONTAINS'

diff --git a/cfc/includes/muraLocationBody.cfm b/cfc/includes/muraLocationBody.cfm
@@ -22,7 +22,12 @@ local.$.loadShadowboxJS(); // for primary image
 		</cfif>
 
 		<!--- Content --->
-		#local.body#
+		#local.$.renderEditableAttribute(
+			attribute='body'
+			, type='HTMLEditor'
+			, label='Content'
+			, enableMuraTag=true
+		)#
 
 		<!--- Location Info --->
 		<!--- <div class="locationInfoWrapper">

diff --git a/plugin/config.xml.cfm b/plugin/config.xml.cfm
@@ -15,7 +15,7 @@
 		<name>MuraLocations</name>
 		<package>MuraLocations</package>
 		<directoryFormat>packageOnly</directoryFormat>
-		<version>3.1.1</version>
+		<version>3.2</version>
 		<provider>Steve Withington</provider>
 		<providerURL>http://stephenwithington.com</providerURL>
 		<category>Application</category>