[midPoint-git] [Evolveum/midpoint] 44326c: MID-7976 fixed conflict resolving (endless loop re...

Viliam Repan noreply at github.com
Wed Aug 17 21:32:13 CEST 2022 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 44326c76d4d6c76bbbfb97496a60360068d1254e
      https://github.com/Evolveum/midpoint/commit/44326c76d4d6c76bbbfb97496a60360068d1254e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-08-17 (Wed, 17 Aug 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java

  Log Message:
  -----------
  MID-7976 fixed conflict resolving (endless loop removed), count badges also now working correctly


  Commit: ebf113af8cc432b7aff6ec1fa762de251954b812
      https://github.com/Evolveum/midpoint/commit/ebf113af8cc432b7aff6ec1fa762de251954b812
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-08-17 (Wed, 17 Aug 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/PredefinedDashboardWidgetId.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.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/impl/component/ContainerableListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/PageTypes.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/table/WidgetTableHeader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusCasesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusHistoryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/DashboardLinkComponent.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/DashboardLinkComponent.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/DashboardSearchPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/DashboardSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/PageSelfDashboard.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/PageSelfDashboard.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/DashboardLinkComponent.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/DashboardLinkComponent.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/DashboardSearchPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/DashboardSearchPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/MyAccessesPreviewDataPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/StatisticDashboardWidget.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/component/StatisticDashboardWidget.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/PageOrgs.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/CasesTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
    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/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationPolicyFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CorrelationItemDefinitionUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-correlation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/authentication/CompiledGuiProfile.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AdminGuiConfigurationMergeManagerImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationCaseDescriber.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/items/CorrelationItem.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java
    M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-default.xml
    M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-fuzzy-gradual.xml
    M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-fuzzy.xml
    M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-original.xml
    M model/model-impl/src/test/resources/correlator/correlation/correlator-complex.xml
    M model/model-intest/src/test/resources/identities/resource-multi.xml
    M model/model-intest/src/test/resources/identities/resource-single.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-archetyped.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
    M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-1.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-template.xml
    M testing/story/src/test/resources/correlation/internal/medium/object-template-user.xml
    M testing/story/src/test/resources/correlation/internal/multi-accounts/020-object-template-user.xml
    M testing/story/src/test/resources/correlation/internal/simple/resource-target-simplified.xml

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


  Commit: 1f39f400aae79491707e65c364a2f38577221f14
      https://github.com/Evolveum/midpoint/commit/1f39f400aae79491707e65c364a2f38577221f14
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-08-17 (Wed, 17 Aug 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ResourceAttributeWrapperImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationPolicyFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/deleg/AttributeDefinitionDelegator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/deleg/RefinedAttributeDefinitionDelegator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CorrelationItemDefinitionUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-correlation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlation/CorrelationCaseDescription.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlation/TemplateCorrelationConfiguration.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelatorContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationCaseDescriber.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelatorContextCreator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/TemplateCorrelationConfigurationImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/BaseCorrelator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/idmatch/IdMatchCorrelator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/idmatch/IdMatchObjectCreator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/items/CorrelationItem.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/items/CorrelationItems.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/items/ItemsCorrelator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/identities/IndexingConfigurationImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/identities/IndexingItemConfigurationImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/identities/NormalizationImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/identities/NormalizationStep.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/inbounds/prep/MappedItems.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/correlation/TestCorrelators.java
    M model/model-impl/src/test/resources/common/resource-dummy.xml
    M model/model-impl/src/test/resources/correlator/correlation/accounts-complex.csv
    M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-fuzzy-gradual.xml
    M model/model-impl/src/test/resources/correlator/correlation/correlator-complex.xml
    M model/model-impl/src/test/resources/correlator/correlation/user-template-complex.xml
    M model/model-intest/src/test/resources/archetypes/resource-dummy-lab.xml
    M model/model-intest/src/test/resources/archetypes/resource-dummy-source.xml
    M model/model-intest/src/test/resources/mapping/resource-target-photos.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/f32613fa60c0...1f39f400aae7

More information about the midPoint-svn mailing list