PRESIDECMS-2772 Allow forcing version number in updateLatestVersionWi…

…thNonVersionedChangesWithFilters
pixl8 · Jan 26, 2024 · 0e79842 · 0e79842
1 parent 108c4ab
commit 0e79842
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/system/services/presideObjects/PresideObjectService.cfc b/system/services/presideObjects/PresideObjectService.cfc
@@ -772,6 +772,7 @@ component displayName="Preside Object Service" {
 		,          boolean calculateChangedData    = false
 		,          struct  changedData             = {}
 		,          numeric timeout                 = _getDefaultTimeout()
+		,          string  forceNonVersionChangesVersionNumber = ""
 	) autodoc=true {
 		var interceptorResult = _announceInterception( "preUpdateObjectData", arguments );
 
@@ -910,12 +911,13 @@ component displayName="Preside Object Service" {
 				);
 			} else if ( hasAnyFilters ) {
 				_getVersioningService().updateLatestVersionWithNonVersionedChangesWithFilters(
-					  objectName   = arguments.objectName
-					, data         = cleanedData
-					, filter       = arguments.filter
-					, filterParams = arguments.filterParams
-					, extraFilters = arguments.extraFilters
-					, savedFilters = arguments.savedFilters
+					  objectName         = arguments.objectName
+					, data               = cleanedData
+					, filter             = arguments.filter
+					, filterParams       = arguments.filterParams
+					, extraFilters       = arguments.extraFilters
+					, savedFilters       = arguments.savedFilters
+					, forceVersionNumber = arguments.forceNonVersionChangesVersionNumber
 				);
 			}
 		}

diff --git a/system/services/presideObjects/VersioningService.cfc b/system/services/presideObjects/VersioningService.cfc
@@ -285,17 +285,19 @@ component {
 	public numeric function updateLatestVersionWithNonVersionedChangesWithFilters(
 		  required string objectName
 		, required struct data
-		,          any    filter       = {}
-		,          struct filterParams = {}
-		,          array  extraFilters = []
-		,          array  savedFilters = []
+		,          any    filter             = {}
+		,          struct filterParams       = {}
+		,          array  extraFilters       = []
+		,          array  savedFilters       = []
+		,          string forceVersionNumber = ""
 	) {
 		var poService           = $getPresideObjectService();
 		var versionObjectName   = poService.getVersionObjectName( arguments.objectName );
 		var useDrafts           = objectUsesDrafts( arguments.objectName );
 		var versionExtraFilters = duplicate( arguments.extraFilters );
 		var versionFilter       = "";
 		var versionParams       = { _version_is_latest=true };
+		var versionData         = duplicate( arguments.data );
 
 		if ( useDrafts ) {
 			versionFilter = "_version_is_latest = :_version_is_latest or _version_is_latest_draft = :_version_is_latest_draft";
@@ -304,14 +306,18 @@ component {
 			versionFilter = "_version_is_latest = :_version_is_latest";
 		}
 
+		if ( Len( arguments.forceVersionNumber ?: "" ) ) {
+			versionData._version_number = arguments.forceVersionNumber;
+		}
+
 		arrayAppend( versionExtraFilters, {
 			  filter       = versionFilter
 			, filterParams = versionParams
 		} );
 
 		poService.updateData(
 			  objectName              = versionObjectName
-			, data                    = arguments.data
+			, data                    = versionData
 			, filter                  = arguments.filter
 			, filterParams            = arguments.filterParams
 			, extraFilters            = versionExtraFilters