Skip to content

Commit

Permalink
fix for MID-8677 applicableForOperation does not work correctly for s…
Browse files Browse the repository at this point in the history
…ome panels
  • Loading branch information
KaterynaHonchar committed Mar 28, 2023
1 parent f6a142a commit 71d73ea
Showing 1 changed file with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,10 @@ private <PC extends ContainerPanelConfigurationType> PC mergePanels(PC mergedPan
mergedPanel.setDefault(configuredPanel.isDefault());
}

if (configuredPanel.getApplicableForOperation() != null) {
mergedPanel.setApplicableForOperation(configuredPanel.getApplicableForOperation());
}

if (!configuredPanel.getPanel().isEmpty()) {
List<ContainerPanelConfigurationType> mergedConfigs = mergeContainerPanelConfigurationType(mergedPanel.getPanel(), configuredPanel.getPanel());
mergedPanel.getPanel().clear();
Expand Down

0 comments on commit 71d73ea

Please sign in to comment.