[midPoint-git] [Evolveum/midpoint] d2fc26: improvements for policy rules panel
kate
honchar at evolveum.com
Wed Oct 11 11:53:18 CEST 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: d2fc263ce92c3460f7ce12aa135d3990ba0332df
https://github.com/Evolveum/midpoint/commit/d2fc263ce92c3460f7ce12aa135d3990ba0332df
Author: kate <honchar at evolveum.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/localization/schema_en.properties
Log Message:
-----------
improvements for policy rules panel
Commit: 1a757bd403c489811661c9cc819c1af864293483
https://github.com/Evolveum/midpoint/commit/1a757bd403c489811661c9cc819c1af864293483
Author: kate <honchar at evolveum.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.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 gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security-cas.xml
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestUnitObjectWrapperFactory.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/WrapperTestUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReference.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/localization/schema_cs.properties
M infra/schema/src/main/resources/localization/schema_de.properties
M infra/schema/src/main/resources/localization/schema_en.properties
M infra/schema/src/main/resources/localization/schema_es.properties
M infra/schema/src/main/resources/localization/schema_et.properties
M infra/schema/src/main/resources/localization/schema_fi.properties
M infra/schema/src/main/resources/localization/schema_hu.properties
M infra/schema/src/main/resources/localization/schema_pl.properties
M infra/schema/src/main/resources/localization/schema_pt_BR.properties
M infra/schema/src/main/resources/localization/schema_ru.properties
M infra/schema/src/main/resources/localization/schema_sk.properties
M infra/schema/src/main/resources/localization/schema_tr.properties
M infra/schema/src/main/resources/localization/schema_zh_CN.properties
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction2.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
A infra/schema/src/test/resources/common/task-bulk-action-2.xml
M infra/schema/testng-unit.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationHook.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/EvaluatedAssignment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ModelExpressionThreadLocalHolder.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.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/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/PolicyRuleProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentConstraintEvaluator.java
A 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/ModificationConstraintEvaluator.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ObjectModificationConstraintEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java
M model/model-impl/src/test/resources/lens/policy/role-student.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationHook.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.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/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ProcessSpecifications.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/metarole/TestAssignmentsWithDifferentMetaroles.java
M model/workflow-impl/src/test/resources/policy/assignments/role-role25-very-complex-approval.xml
A model/workflow-impl/src/test/resources/policy/assignments/role-role27-modifications-and.xml
A model/workflow-impl/src/test/resources/policy/assignments/role-role28-modifications-or.xml
A model/workflow-impl/src/test/resources/policy/assignments/role-role29-modifications-no-items.xml
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
A samples/tasks/bulk-actions/add-user.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
M testing/story/src/test/resources/delivery/rules/k10-tpu-10-rem-elaine.xml
M testing/story/src/test/resources/delivery/rules/k10-tpu-10.xml
M testing/story/src/test/resources/delivery/rules/k10.xml
M testing/story/src/test/resources/delivery/schema/rules.xsd
M testing/story/src/test/resources/delivery/users/barkeeper.xml
M testing/story/src/test/resources/strings/roles/global-policy-rules.xml
M testing/story/testng-integration.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
# Conflicts:
# gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
Compare: https://github.com/Evolveum/midpoint/compare/410d19dd3153...1a757bd403c4
More information about the midPoint-svn
mailing list