[midPoint-git] [Evolveum/midpoint] 042f3f: MID-3998 fix

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 042f3f42ae65ba9497ee5aef067b27be0b0a5be0
      https://github.com/Evolveum/midpoint/commit/042f3f42ae65ba9497ee5aef067b27be0b0a5be0
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java

  Log Message:
  -----------
  MID-3998 fix


  Commit: 3349e196bfb421b298c9e81c6c2470276e82f239
      https://github.com/Evolveum/midpoint/commit/3349e196bfb421b298c9e81c6c2470276e82f239
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/resources/diff/role-compare.xml
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java
    M model/certification-impl/src/test/resources/common/system-configuration.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.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/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentKey.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityPrincipal.java
    M model/model-intest/src/test/resources/logback-test.xml
    R model/model-intest/src/test/resources/rbac/global-policy-rules-exclusion.xml
    R model/model-intest/src/test/resources/rbac/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/role-all-loot.xml
    A model/model-intest/src/test/resources/rbac/role-all-treasure.xml
    A model/model-intest/src/test/resources/rbac/role-all-you-can-get.xml
    R model/model-intest/src/test/resources/rbac/role-citizen-sk.xml
    R model/model-intest/src/test/resources/rbac/role-citizen-us.xml
    R model/model-intest/src/test/resources/rbac/role-color-blue.xml
    R model/model-intest/src/test/resources/rbac/role-color-green.xml
    R model/model-intest/src/test/resources/rbac/role-color-none.xml
    R model/model-intest/src/test/resources/rbac/role-color-red.xml
    R model/model-intest/src/test/resources/rbac/role-controlling-1.xml
    R model/model-intest/src/test/resources/rbac/role-controlling-2.xml
    R model/model-intest/src/test/resources/rbac/role-criminal.xml
    R model/model-intest/src/test/resources/rbac/role-executive-1.xml
    R model/model-intest/src/test/resources/rbac/role-executive-2.xml
    A model/model-intest/src/test/resources/rbac/role-loot-diamonds.xml
    R model/model-intest/src/test/resources/rbac/role-meta-color.xml
    R model/model-intest/src/test/resources/rbac/role-meta-controlling.xml
    R model/model-intest/src/test/resources/rbac/role-meta-executive.xml
    R model/model-intest/src/test/resources/rbac/role-minister.xml
    R model/model-intest/src/test/resources/rbac/role-prize-bronze.xml
    R model/model-intest/src/test/resources/rbac/role-prize-gold.xml
    R model/model-intest/src/test/resources/rbac/role-prize-silver.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-bronze.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-gold.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-silver.xml
    A model/model-intest/src/test/resources/rbac/sod/global-policy-rules-exclusion.xml
    A model/model-intest/src/test/resources/rbac/sod/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/sod/role-citizen-sk.xml
    A model/model-intest/src/test/resources/rbac/sod/role-citizen-us.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-blue.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-green.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-none.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-red.xml
    A model/model-intest/src/test/resources/rbac/sod/role-controlling-1.xml
    A model/model-intest/src/test/resources/rbac/sod/role-controlling-2.xml
    A model/model-intest/src/test/resources/rbac/sod/role-criminal.xml
    A model/model-intest/src/test/resources/rbac/sod/role-executive-1.xml
    A model/model-intest/src/test/resources/rbac/sod/role-executive-2.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-color.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-controlling.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-executive.xml
    A model/model-intest/src/test/resources/rbac/sod/role-minister.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-bronze.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-gold.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-silver.xml
    A model/model-intest/src/test/resources/security/org-indirect-pirate.xml
    A model/model-intest/src/test/resources/security/role-indirect-pirate.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestMiscellaneous.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/5fb2234ba99c...3349e196bfb4