From 4bdfbcf874f58ebd1ba163a58b4245df9b5f6be0 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Tue, 13 Feb 2024 22:50:18 +0100 Subject: [PATCH 1/7] more issues on upload artifacts --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 02cafab1a..8baace76f 100644 --- a/.github/workflows/tests.yml +++ b/.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 }} path: | tests/results/**/* From b8db1b75d7ee89b2330b27ff7327f03be10c9919 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Tue, 13 Feb 2024 22:59:59 +0100 Subject: [PATCH 2/7] trying once again this dump ci --- .github/workflows/release.yml | 6 +++--- .github/workflows/tests.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3899a2cf1..3349ab149 100644 --- a/.github/workflows/release.yml +++ b/.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-experimental-false/contentbox-swagger.json; then + cp -v tests/results/contentbox-test-results-lucee@5-jdk11-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-experimental-false/contentbox-swagger.json does not exist" fi # Run Docs Build box run-script build:allDocs diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8baace76f..6b4bb3343 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -123,7 +123,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: contentbox-test-results-${{ matrix.cfengine }} + name: contentbox-test-results-${{ matrix.cfengine }}-jdk${{ matrix.jdkVersion }}-experimental-${{ matrix.experimental }} path: | tests/results/**/* From ea118750930f79c09a6fe2dbf39a26ea213da8e2 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Tue, 13 Feb 2024 23:08:21 +0100 Subject: [PATCH 3/7] more tests --- .github/workflows/release.yml | 6 +++--- .github/workflows/tests.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3349ab149..561056125 100644 --- a/.github/workflows/release.yml +++ b/.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-jdk11-experimental-false/contentbox-swagger.json; then - cp -v tests/results/contentbox-test-results-lucee@5-jdk11-experimental-false/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-jdk11-experimental-false/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 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6b4bb3343..deaa2885e 100644 --- a/.github/workflows/tests.yml +++ b/.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 }}-experimental-${{ matrix.experimental }} + name: contentbox-test-results-${{ matrix.cfengine }}-jdk${{ matrix.jdkVersion }}-coldbox${{ matrix.coldboxVersion }}-experimental-${{ matrix.experimental }} path: | tests/results/**/* From e46207ab347d20bfc56c68cad6389ce973fd9760 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Tue, 13 Feb 2024 23:19:57 +0100 Subject: [PATCH 4/7] fix typo --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 561056125..ac10e08c3 100644 --- a/.github/workflows/release.yml +++ b/.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-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/ + 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-jdk11-coldbox-^7-experimental-false/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 From 244e9b5b67cb7575613fc16267a8aad3ab7db6c8 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Tue, 13 Feb 2024 23:30:33 +0100 Subject: [PATCH 5/7] CONTENTBOX-1507 #resolve BulkSave not accounting for sites when filtering and saving --- changelog.md | 1 + config/Coldbox.cfc | 1 + modules/contentbox/models/system/SettingService.cfc | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index b9c473eee..4ec6aa10d 100644 --- a/changelog.md +++ b/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 diff --git a/config/Coldbox.cfc b/config/Coldbox.cfc index 4c51a9bb2..7efb02331 100755 --- a/config/Coldbox.cfc +++ b/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"; diff --git a/modules/contentbox/models/system/SettingService.cfc b/modules/contentbox/models/system/SettingService.cfc index eb12f542c..d758306c6 100755 --- a/modules/contentbox/models/system/SettingService.cfc +++ b/modules/contentbox/models/system/SettingService.cfc @@ -612,7 +612,7 @@ 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 ) ) { From 0145dd191b2724a41c17d00384d738a623db1ede Mon Sep 17 00:00:00 2001 From: lmajano Date: Tue, 13 Feb 2024 22:33:35 +0000 Subject: [PATCH 6/7] Apply cfformat changes --- config/Coldbox.cfc | 2 +- modules/contentbox/models/system/SettingService.cfc | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config/Coldbox.cfc b/config/Coldbox.cfc index 7efb02331..de97ab4d2 100755 --- a/config/Coldbox.cfc +++ b/config/Coldbox.cfc @@ -159,7 +159,7 @@ component { function development(){ coldbox.handlersIndexAutoReload = true; coldbox.handlerCaching = false; - coldbox.debugMode = true; + coldbox.debugMode = true; coldbox.reinitpassword = ""; coldbox.customErrorTemplate = "/coldbox/system/exceptions/Whoops.cfm"; diff --git a/modules/contentbox/models/system/SettingService.cfc b/modules/contentbox/models/system/SettingService.cfc index d758306c6..c70fd3096 100755 --- a/modules/contentbox/models/system/SettingService.cfc +++ b/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, site : !isNull( arguments.site ) ? arguments.site : javaCast( "null", "" ) } ); + var thisSetting = findWhere( { + name : key, + site : !isNull( arguments.site ) ? arguments.site : javacast( "null", "" ) + } ); // Maybe it's a new setting :) if ( isNull( thisSetting ) ) { From 8fe39f517450533a63889fe9f0e172185e28ff4e Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Tue, 13 Feb 2024 23:39:20 +0100 Subject: [PATCH 7/7] issue on new migrations due to order to operations --- modules/contentbox/migrations/2020_01_01_150933_init.cfc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/contentbox/migrations/2020_01_01_150933_init.cfc b/modules/contentbox/migrations/2020_01_01_150933_init.cfc index 7138d2a7b..b0dbd863c 100755 --- a/modules/contentbox/migrations/2020_01_01_150933_init.cfc +++ b/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 ); }