Merge branch 'stable' into feature-PRESIDECMS-2749_email-stats-and-logging-performance

Author: DominicWatson

system/coldboxModifications/RequestContextDecorator.cfc

@@ -765,13 +765,15 @@ component accessors=true extends="preside.system.coldboxModifications.RequestCon
 
 		clearBreadCrumbs();
 
-		if ( !IsNull( arguments.parentpage ?: NullValue() ) && arguments.parentPage.recordCount ) {
-			page.parent_page = arguments.parentPage.id;
+		announceInterception( "preInitializeDummyPresideSiteTreePage", { page = page } );
 
-			var ancestors = sitetreeSvc.getAncestors( id = arguments.parentPage.id );
+		if ( !IsNull( page.parentpage ?: NullValue() ) && page.parentPage.recordCount ) {
+			page.parent_page = page.parentPage.id;
+
+			var ancestors = sitetreeSvc.getAncestors( id = page.parentPage.id );
 
 			page.ancestorList = ancestors.recordCount ? ValueList( ancestors.id ) : "";
-			page.ancestorList = ListAppend( page.ancestorList, arguments.parentPage.id );
+			page.ancestorList = ListAppend( page.ancestorList, page.parentPage.id );
 
 			page.permissionContext = [];
 			for( var i=ListLen( page.ancestorList ); i > 0; i-- ){
@@ -783,7 +785,7 @@ component accessors=true extends="preside.system.coldboxModifications.RequestCon
 				page.ancestors.append( ancestor );
 			}
 
-			for( var p in arguments.parentPage ){
+			for( var p in page.parentPage ){
 				addBreadCrumb( title=p.title, link=buildLink( page=p.id ), menuTitle=p.navigation_title ?: "" );
 				page.ancestors.append( p );
 			}

system/forms/formbuilder/item-types/select.xml

@@ -2,7 +2,8 @@
 <form i18nBaseUri="formbuilder.item-types.select:">
 	<tab id="default">
 		<fieldset id="default">
-			<field name="multiple"    control="yesnoswitch"             required="false" sortorder="32" />
+			<field name="multiple"           control="yesNoSwitch" required="false" sortorder="32" />
+			<field name="includeEmptyOption" control="yesNoSwitch" required="false" sortorder="33" />
 		</fieldset>
 	</tab>
 	<tab id="values">

system/handlers/formbuilder/item-types/Select.cfc

@@ -10,6 +10,7 @@ component {
 		formControlArgs.layout                  = "";
 		formControlArgs.required                = IsTrue( args.mandatory ?: "" );
 		formControlArgs.multiple                = IsTrue( args.multiple  ?: "" );
+		formControlArgs.includeEmptyOption      = IsTrue( args.includeEmptyOption  ?: "" );
 		formControlArgs.class                   = "form-control";
 		formControlArgs.removeObjectPickerClass = true;
 
@@ -27,7 +28,6 @@ component {
 		return renderFormControl( argumentCollection = formControlArgs );
 	}
 
-
 	private string function renderResponse( event, rc, prc, args={} ) {
 		return ArrayToList( _renderResponses( argumentCollection=arguments, useLabel=true ), args.delim ?: "<br>" );
 	}

system/i18n/formbuilder/item-types/select.properties

@@ -2,6 +2,7 @@ title=Select Box
 iconclass=fa-list-alt
 
 field.multiple.title=Allow multiple choice?
+field.includeEmptyOption.title=Include empty option?
 
 tab.values.title=Values / auto population
 tab.values.description=Choose either a Data manager object as the source of the values, or manually enter values in the Values and Labels inputs.