[midPoint-git] [Evolveum/midpoint] 0eccbc: partial fix for MID-3189

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0eccbcea7ab2022717986b47b3963fb32a9bb34c
      https://github.com/Evolveum/midpoint/commit/0eccbcea7ab2022717986b47b3963fb32a9bb34c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  partial fix for MID-3189
Delete org (tenant) with members problem

popup with warning message


  Commit: 5b5e33b060723d6af6e63e0dd30fbd68967ef02b
      https://github.com/Evolveum/midpoint/commit/5b5e33b060723d6af6e63e0dd30fbd68967ef02b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  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/page/admin/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/logback.xml
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    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/TestSecurity.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java

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


Compare: https://github.com/Evolveum/midpoint/compare/59eeef761274...5b5e33b06072