[midPoint-git] [Evolveum/midpoint] a0ca32: Fix multi-segment paths in included templates
mederly
noreply at github.com
Fri Nov 25 14:11:26 CET 2022
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: a0ca3252d90f0db40d7e086becbbe17f703023c6
https://github.com/Evolveum/midpoint/commit/a0ca3252d90f0db40d7e086becbbe17f703023c6
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-11-25 (Fri, 25 Nov 2022)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/TypeSpecificMergersConfigurator.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/key/ItemPathNaturalKeyImpl.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/key/SingletonItemPathNaturalKeyImpl.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/misc/TestMiscellaneous.java
R model/model-impl/src/test/resources/controller/schema/expected-user-default.xml
R model/model-impl/src/test/resources/controller/schema/expected-user.xml
R model/model-impl/src/test/resources/controller/schema/template.xml
R model/model-impl/src/test/resources/controller/schema/user-with-fullname.xml
R model/model-impl/src/test/resources/controller/schema/user-without-fullname.xml
M model/model-impl/src/test/resources/misc/template-b1.xml
M model/model-impl/src/test/resources/misc/template-b2a.xml
M model/model-impl/src/test/resources/misc/template-b2b.xml
M model/model-intest/src/test/resources/common/user-template-complex-include.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Fix multi-segment paths in included templates
The <ref> elements with more than one segment (e.g. `extension/abc`)
stopped working in scenarios with object template inclusion in 4.6.
This is now fixed.
(Also, some obsolete test files were deleted.)
This resolves MID-8351.
Commit: 557789c8b725618fcbb783ddc7389f8f6993dcdf
https://github.com/Evolveum/midpoint/commit/557789c8b725618fcbb783ddc7389f8f6993dcdf
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-11-25 (Fri, 25 Nov 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/dabbde0641ec...557789c8b725
More information about the midPoint-svn
mailing list