[midPoint-git] [Evolveum/midpoint] a5dd72: Improvements for policy constraints and actions pr...
Pavol Mederly
mederly at evolveum.com
Tue Oct 31 10:49:52 CET 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: a5dd72f008e97c965bcf1726115c02117ad56565
https://github.com/Evolveum/midpoint/commit/a5dd72f008e97c965bcf1726115c02117ad56565
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-10-31 (Tue, 31 Oct 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentModificationConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ConstraintEvaluatorHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/MultiplicityConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ObjectModificationConstraintEvaluator.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/AbstractTestLifecycle.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/lifecycle/global/TestLifecycleGlobal.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/object/TestObjectConstraints.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestActivitiQuery.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
M model/workflow-impl/src/test/resources/policy/object/metarole-constraints.xml
Log Message:
-----------
Improvements for policy constraints and actions presentation.
Option to explicitly set approval names (processes, work items, tasks).
Option to set approval names to default value using #default# key.
Added objectDisplayInformation, targetDisplayInformation variables for constraint/action presentation.
Minor GUI code fixes.
New midpoint.translate scripting function.
Resolving LocalizableMessageTemplateType to LocalizableMessageType in ModelInteractionService.
Commit: 0c55eafb6770a6fed9d5c6059f05bebb662d5f89
https://github.com/Evolveum/midpoint/commit/0c55eafb6770a6fed9d5c6059f05bebb662d5f89
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-10-31 (Tue, 31 Oct 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/Wro4jConfig.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointUrlLocatorFactory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/PropertyUrlUriLocator.java
M gui/admin-gui/src/main/resources/wro.xml
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelProjectionContext.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
A model/model-intest/src/test/resources/mapping/role-antinihilist.xml
A model/model-intest/src/test/resources/rbac/metameta/role-meta-greek-group.xml
A model/model-intest/src/test/resources/rbac/metameta/role-meta-latin-group.xml
A model/model-intest/src/test/resources/rbac/metameta/role-meta-legacy-one.xml
A model/model-intest/src/test/resources/rbac/metameta/role-meta-meta-legacy.xml
A model/model-intest/src/test/resources/rbac/metameta/role-meta-meta-world.xml
M model/model-intest/src/test/resources/rbac/role-meta-fool.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
# Conflicts:
# model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
Compare: https://github.com/Evolveum/midpoint/compare/d61396a50350...0c55eafb6770
More information about the midPoint-svn
mailing list