[midPoint-git] [Evolveum/midpoint] da7fe4: MID-3845: added relation to "show all assignments"
Pavol Mederly
mederly at evolveum.com
Wed Nov 29 19:23:15 CET 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: da7fe412d797f61aca5fe8476c43bca08fcd28b6
https://github.com/Evolveum/midpoint/commit/da7fe412d797f61aca5fe8476c43bca08fcd28b6
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-11-29 (Wed, 29 Nov 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/AbstractRoleAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.ast
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AllAssignmentsPreviewDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentInfoDto.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/DelegationTargetLimitationDialog.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
M infra/schema/src/main/resources/localization/schema.properties
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignmentTarget.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.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/EvaluatedAssignmentTargetImpl.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
Log Message:
-----------
MID-3845: added relation to "show all assignments"
+ added deputy relations there
+ refactored assignments info dialog
Commit: b320c560a7beb1031abe3e16ec631bfb0e8a93f2
https://github.com/Evolveum/midpoint/commit/b320c560a7beb1031abe3e16ec631bfb0e8a93f2
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-11-29 (Wed, 29 Nov 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/AbstractRoleAssignmentPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.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/admin/workflow/PageWorkItemsAttorney.java
M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
A infra/schema/src/test/resources/diff/role-1.xml
A infra/schema/src/test/resources/diff/role-2.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMappingAutoInbound.java
M model/model-intest/src/test/resources/common/role-autocratic.xml
M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml
M model/model-intest/src/test/resources/schema/piracy.xsd
M samples/evolveum/roles.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
# Conflicts:
# gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
Commit: 6bd06bd62d3dd4c2d119dd3a826b9b6b070ed9d6
https://github.com/Evolveum/midpoint/commit/6bd06bd62d3dd4c2d119dd3a826b9b6b070ed9d6
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-11-29 (Wed, 29 Nov 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
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/gui/api/util/WebModelServiceUtils.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameChoiceRenderer.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
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/services/PageService.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseMisc.java
A infra/schema/src/test/resources/misc/role-filters.xml
M infra/schema/testng-unit.xml
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
A model/model-intest/src/test/resources/misc/role-import-filters.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
# Conflicts:
# gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
Compare: https://github.com/Evolveum/midpoint/compare/503e64169ce6...6bd06bd62d3d
More information about the midPoint-svn
mailing list