[midPoint-git] [Evolveum/midpoint] 64e683: Mapping range is checked only if condition is true...

[Pavol Mederly]

  Branch: refs/heads/support-3.5
  Home:   https://github.com/Evolveum/midpoint
  Commit: 64e68385f3c5ac769e6042c46cf74ca64d1496fd
      https://github.com/Evolveum/midpoint/commit/64e68385f3c5ac769e6042c46cf74ca64d1496fd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java

  Log Message:
  -----------
  Mapping range is checked only if condition is true (old or new one).

(cherry picked from commit 2c8c07a)


  Commit: 89db02b152a04ff8edca7d738b7b3656f5095865
      https://github.com/Evolveum/midpoint/commit/89db02b152a04ff8edca7d738b7b3656f5095865
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/PredefinedDashboardWidgetId.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/TreeStateSet.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/common/role-pirate.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/support-3.5' into support-3.5


Compare: https://github.com/Evolveum/midpoint/compare/1164746a3490...89db02b152a0