[midPoint-git] [Evolveum/midpoint] d87886: fixing search in role member panel, hiding member ...
Katarina Valalikova
k.valalikova at evolveum.com
Mon Nov 9 14:22:00 CET 2015
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: d8788629fb04fe21dcd41d0fb133502f3aeced66
https://github.com/Evolveum/midpoint/commit/d8788629fb04fe21dcd41d0fb133502f3aeced66
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberSearchDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
fixing search in role member panel, hiding member panel for new role (add operation)
Commit: 7777cc03c8e55a64ee9fce1c471e895b3af6bf70
https://github.com/Evolveum/midpoint/commit/7777cc03c8e55a64ee9fce1c471e895b3af6bf70
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M build-system/pom.xml
M config/initial-objects/100-report-reconciliation.xml
M config/initial-objects/110-report-user-list.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesSelectionPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/TypeFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/LogfileTestTailer.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestFilterExpression.java
A model/model-impl/src/test/resources/expr/expression-employeeType-all-filter.xml
A model/model-impl/src/test/resources/expr/expression-employeeType-empty-filter.xml
A model/model-impl/src/test/resources/expr/expression-employeeType-error.xml
A model/model-impl/src/test/resources/expr/expression-employeeType-filter-defaults.xml
A model/model-impl/src/test/resources/expr/expression-employeeType-none-filter.xml
A model/model-impl/src/test/resources/expr/expression-employeeType-undefined-filter.xml
A model/model-impl/src/test/resources/expr/expression-linkref-filter-defaults.xml
A model/model-impl/src/test/resources/expr/expression-linkref-object-reference-type-filter-defaults.xml
R model/model-impl/src/test/resources/expr/expression-to-empty-filter-allowed-null.xml
R model/model-impl/src/test/resources/expr/expression-to-empty-filter.xml
R model/model-impl/src/test/resources/expr/expression-to-undefined-filter-allowed-false.xml
M model/model-impl/src/test/resources/logback-test.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
M model/model-intest/src/test/resources/common/resource-dummy.xml
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/src/test/resources/sync/account-augustus-dummy.xml
M model/model-intest/src/test/resources/sync/account-taugustus-dummy.xml
M model/model-intest/src/test/resources/sync/resource-dummy-lime-deprecated.xml
M model/model-intest/src/test/resources/sync/resource-dummy-lime.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ConfigurationExceptionHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
A testing/consistency-mechanism/src/test/resources/request/user-modify-activation-change-password.xml
M testing/story/src/test/resources/village/role-basic.xml
M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
M testing/wstest/src/test/resources/common/resource-opendj.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Conflicts:
gui/admin-gui/src/main/resources/localization/Midpoint.properties
Compare: https://github.com/Evolveum/midpoint/compare/0531ec789951...7777cc03c8e5
More information about the midPoint-svn
mailing list