Skip to content

Feature presidecms 2772 allow forcing of version number in update latest version with non versioned changes with filters #1414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pixl8RusselCole wants to merge 2 commits into
base: stable
Choose a base branch
from
Open

Feature presidecms 2772 allow forcing of version number in update latest version with non versioned changes with filters #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
108c4ab
[twgit] Init feature 'feature-PRESIDECMS-2772_allow-forcing-of-versio…
Pixl8RusselCole Jan 26, 2024
0e79842
PRESIDECMS-2772 Allow forcing version number in updateLatestVersionWi…
Pixl8RusselCole Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions system/services/presideObjects/PresideObjectService.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down Expand Up @@ -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
);
}
}
Expand Down
16 changes: 11 additions & 5 deletions system/services/presideObjects/VersioningService.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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
Expand Down