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:
Pull latest Mdm-App-Build.
Pull this branch mdm-core
in mdm core. publish mdm-security to maven local
in application build replace the security dependancy with:
'runtimeOnly "uk.ac.ox.softeng.maurodatamapper:mdm-security:5.4.0-SNAPSHOT" '
closes #459
Relates to https://github.com/MauroDataMapper/mdm-ui/issues/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" '