gh-459 Allows main version folders to be merged into other branches #460
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ging if in a versioned folder (merge the folders instead) added a test to test merging main branch source
… actions addition" This reverts commit 50ac52b.
jamesrwelch
force-pushed
the
feature/gh-459-update-securitypolicy-to-allow-merging
branch
from
ea51c33
to
40f41e2
Compare
jamesrwelch
reviewed
May 29, 2024
| } | ||
| if (role.canVersion()) { | ||
| updatedActions.addAll(EDITOR_VERSIONING_ACTIONS) | ||
| } | ||
|
|
||
| if ((role.domainType == "VersionedFolder" || role.domainType == "DataModel") && !role.isFinalised()){ |
There was a problem hiding this comment.
I think we should consider other model types here: CodeSet, Terminology and ReferenceDataModel
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #459
Relates to MauroDataMapper/mdm-ui#854
Currently a main branch of a version folder or a model cannot be merged into a branch.
This is a ui problem as it functions fine as far as the back end is concerned.
This update edits the allowed actions for these types of object to allow them to be merged.
We add the MERGE_INTO_ACTION into the allowed admin actions for these types of model/folder, the ui then generates the merge ui for them
Via mdm-core:
run as normal
to install new security config:
Via mdm-application-build:
'runtimeOnly "uk.ac.ox.softeng.maurodatamapper:mdm-security:5.4.0-SNAPSHOT" '