Merge branch 'development'

.github/workflows/release.yml

@@ -115,10 +115,10 @@ jobs:
       - name: Build API Docs
         run: |
           # Normalize swagger doc results if they exist
-          if test -f tests/results/contentbox-test-results-lucee@5/contentbox-swagger.json; then
-            cp -v tests/results/contentbox-test-results-lucee@5/contentbox-swagger.json tests/results/
+          if test -f tests/results/contentbox-test-results-lucee@5-jdk11-coldbox^7-experimental-false/contentbox-swagger.json; then
+            cp -v tests/results/contentbox-test-results-lucee@5-jdk11-coldbox^7-experimental-false/contentbox-swagger.json tests/results/
           else
-            echo "File tests/results/contentbox-test-results-lucee@5/contentbox-swagger.json does not exist"
+            echo "File tests/results/contentbox-test-results-lucee@5-jdk11-coldbox^7-experimental-false/contentbox-swagger.json does not exist"
           fi
           # Run Docs Build
           box run-script build:allDocs

.github/workflows/tests.yml

@@ -123,7 +123,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: contentbox-test-results-${{ matrix.cfengine }}-jdk${{ matrix.jdkVersion }}-coldbox${{ matrix.coldboxVersion }}
+          name: contentbox-test-results-${{ matrix.cfengine }}-jdk${{ matrix.jdkVersion }}-coldbox${{ matrix.coldboxVersion }}-experimental-${{ matrix.experimental }}
           path: |
             tests/results/**/*
 

changelog.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bugs
 
+- [CONTENTBOX-1507](https://ortussolutions.atlassian.net/browse/CONTENTBOX-1507) BulkSave not accounting for sites when filtering and saving
 - [CONTENTBOX-1506](https://ortussolutions.atlassian.net/browse/CONTENTBOX-1506) Updated all server.jsons to use \`env\` for the ortus orm extension since the latest lucee build broken extensions via jvm args
 - [CONTENTBOX-1505](https://ortussolutions.atlassian.net/browse/CONTENTBOX-1505) RenderView widget exception when using \`view\(\)\` to render the view
 

config/Coldbox.cfc

@@ -159,6 +159,7 @@ component {
 	function development(){
 		coldbox.handlersIndexAutoReload = true;
 		coldbox.handlerCaching          = false;
+		coldbox.debugMode               = true;
 		coldbox.reinitpassword          = "";
 		coldbox.customErrorTemplate     = "/coldbox/system/exceptions/Whoops.cfm";
 

modules/contentbox/migrations/2020_01_01_150933_init.cfc

@@ -14,11 +14,11 @@ component {
 		var migrations = [
 			"sites"                   : { table : "cb_site" },
 			"settings"                : { table : "cb_setting" },
-			"roles"                   : { table : "cb_role" },
 			"permissions"             : { table : "cb_permission" },
 			"permission_groups"       : { table : "cb_permissionGroup" },
-			"role_permissions"        : { table : "cb_rolePermissions" },
 			"group_permissions"       : { table : "cb_groupPermissions" },
+			"roles"                   : { table : "cb_role" },
+			"role_permissions"        : { table : "cb_rolePermissions" },
 			"author"                  : { table : "cb_author" },
 			"author_permissions"      : { table : "cb_authorPermissions" },
 			"author_permission_groups": { table : "cb_authorPermissionGroups" },
@@ -63,7 +63,7 @@ component {
 				}
 
 				// Seeding Roles
-				if ( migration == "roles" ) {
+				if ( migration == "role_permissions" ) {
 					systemOutput( "- Seeding roles...", true );
 					new init.seed_roles().seed( schema, query );
 				}

modules/contentbox/models/system/SettingService.cfc

@@ -612,7 +612,10 @@ component
 			} )
 			// Build out array of settings to save
 			.each( function( key, value ){
-				var thisSetting = findWhere( { name : key } );
+				var thisSetting = findWhere( {
+					name : key,
+					site : !isNull( arguments.site ) ? arguments.site : javacast( "null", "" )
+				} );
 
 				// Maybe it's a new setting :)
 				if ( isNull( thisSetting ) ) {