Merge pull request #634 from Ortus-Solutions/development

v6.3.0

Author: lmajano

.github/workflows/lts.yml

@@ -18,7 +18,7 @@ jobs:
   ##########################################################################################
   format:
     name: Code Auto-Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/pr.yml

@@ -19,7 +19,7 @@ jobs:
 
   format_check:
     name: Checks Source Code Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -222,7 +222,7 @@ jobs:
   prep_next_release:
     name: Prep Next Release
     if: github.ref != 'refs/heads/development'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [ build ]
     steps:
       - name: Checkout Development Repository

.github/workflows/snapshot.yml

@@ -24,7 +24,7 @@ jobs:
   ##########################################################################################
   format:
     name: Code Auto-Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   tests:
     name: Test Suites
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       DB_USER: root
       DB_PASSWORD: root
@@ -24,6 +24,15 @@ jobs:
         experimental: [ false ]
         include:
           # Lucee 6 has a regression
+          - cfengine: "boxlang@1"
+            coldboxVersion: "^7"
+            jdkVersion: "21"
+            experimental: true
+          - cfengine: "boxlang@1"
+            coldboxVersion: "be"
+            jdkVersion: "21"
+            experimental: true
+          # Lucee 6 has a regression
           - cfengine: "lucee@6"
             coldboxVersion: "^7"
             jdkVersion: "21"

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ContentBox Tester Site",
-    "version":"6.1.1",
+    "version":"6.3.0",
     "author":"Ortus Solutions <info@ortussolutions.com>",
     "shortDescription":"A tester site for developing the ContentBox Modular CMS",
     "type":"cms",
@@ -25,14 +25,13 @@
     ],
     "dependencies":{
         "coldbox":"be",
-        "commandbox-migrations":"^5.0.0"
+        "commandbox-migrations":"*"
     },
     "devDependencies":{
-        "testbox":"^5.0.0+1",
-        "commandbox-boxlang":"*",
+		"commandbox-boxlang":"*",
         "commandbox-cfformat":"*",
-        "commandbox-cfconfig":"*",
         "commandbox-docbox":"*",
+        "testbox":"*",
         "cbdebugger":"*",
         "route-visualizer":"*"
     },

modules/contentbox/box.json

@@ -26,7 +26,7 @@
         "Curt Gratz <gratz@computerknowhow.com>"
     ],
     "dependencies":{
-        "cborm":"^4.0.0",
+        "cborm":"^4.10.0",
         "cbjavaloader":"^2.0.0",
         "cbmailservices":"^2.0.0",
         "cbsecurity":"^3.0.0",

modules/contentbox/models/content/BaseContent.cfc

@@ -161,7 +161,6 @@ component
 		column ="expireDate"
 		notnull="false"
 		ormtype="timestamp"
-		default=""
 		index  ="idx_expireDate";
 
 	property
@@ -318,9 +317,7 @@ component
 		inverse     ="true"
 		cascade     ="all-delete-orphan";
 
-	property
-		name        ="activeContentVersions"
-		persistent  = "false";
+	property name="activeContentVersions" persistent="false";
 
 	// M20 -> Parent Page loaded as a proxy
 	property
@@ -768,7 +765,7 @@ component
 	function getFeaturedImageURL(){
 		var featured = getFeaturedImage();
 		return !isNull( featured ) && len( featured ) ? (
-			find( ":", featured )
+			!findNoCase( mediaService.getCoreMediaRoot(), featured ) && find( ":", featured )
 			 ? "/__media/" & featured
 			// legacy column values without disk annoations
 			 : replaceNoCase(
@@ -801,15 +798,16 @@ component
 	){
 		// lock it for new content creation to avoid version overlaps
 		lock name="contentbox.addNewContentVersion.#getSlug()#" type="exclusive" timeout="10" throwOnTimeout=true {
-
 			// Do we already have an active version?
 			if ( hasActiveContent() ) {
 				// cap checks if not in preview mode
 				if ( !arguments.isPreview ) {
 					maxContentVersionChecks();
 				}
 				// deactive the curent version, we do it after in case the content versions check kick off a transaction
-				getContentVersions().filter( ( version ) => version.getIsActive() ).each( ( version ) => version.setIsActive( false ) );
+				getContentVersions()
+					.filter( ( version ) => version.getIsActive() )
+					.each( ( version ) => version.setIsActive( false ) );
 			}
 
 			// get a new version object with our incoming content + relationships

modules/contentbox/models/content/EntryService.cfc

@@ -169,13 +169,13 @@ component extends="ContentService" singleton {
 		// we use HQL so we can be DB independent using the map() hql function thanks to John Wish, you rock!
 		var hql = "SELECT new map( count(*) as count, YEAR(publishedDate) as year, MONTH(publishedDate) as month )
 				   FROM cbEntry
-				  WHERE isPublished = true
+				  WHERE isPublished = :isPublished
 				    AND passwordProtection = ''
 				    AND publishedDate <= :now
 				  GROUP BY YEAR(publishedDate), MONTH(publishedDate)
 				  ORDER BY 2 DESC, 3 DESC";
 		// run report
-		return executeQuery( query = hql, params = { "now" : now() } );
+		return executeQuery( query = hql, params = { "isPublished" : true, "now" : now() } );
 	}
 
 	/**
@@ -202,10 +202,10 @@ component extends="ContentService" singleton {
 	){
 		var results = {};
 		var hql     = "FROM cbEntry
-				  WHERE isPublished = true
+				  WHERE isPublished = :isPublished
 				    AND passwordProtection = ''
 				    AND publishedDate <= :now";
-		var params      = {};
+		var params      = { "isPublished" : true };
 		params[ "now" ] = now();
 
 		// Site

modules/contentbox/modules/contentbox-admin/views/settings/index.cfm

@@ -42,7 +42,7 @@
                             </li>
                             <li class="nav-item">
 								<a href="##login_options" data-toggle="tab" class="nav-link">
-									<i class="fa fa-sign-in fa-lg"></i> Login
+									<i class="fa fa-sign-in-alt fa-lg"></i> Login
 								</a>
                             </li>
                             <li class="nav-item">