Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TECHNICAL-SUPPOR] LPS-26805 Nested-portlets missing from merge #202

Closed
wants to merge 1 commit into from
Closed

[TECHNICAL-SUPPOR] LPS-26805 Nested-portlets missing from merge #202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions portal-impl/src/com/liferay/portal/lar/LayoutImporter.java
View file
Open in desktop
Expand Up @@ -1394,6 +1394,23 @@ protected void mergePortlets(
LayoutTypePortletConstants.LAYOUT_TEMPLATE_ID, LayoutTypePortletConstants.LAYOUT_TEMPLATE_ID,
layoutTemplateId); layoutTemplateId);


String nestedColumnIds = newTypeSettingsProperties.getProperty(
LayoutTypePortletConstants.NESTED_COLUMN_IDS, StringPool.BLANK);

if (!nestedColumnIds.equals(StringPool.BLANK)) {
previousTypeSettingsProperties.setProperty(
LayoutTypePortletConstants.NESTED_COLUMN_IDS,
nestedColumnIds);

for (String nestedColumnId :
StringUtil.split(nestedColumnIds)) {

previousTypeSettingsProperties.setProperty(
nestedColumnId,
newTypeSettingsProperties.getProperty(nestedColumnId));
}
}

LayoutTemplate newLayoutTemplate = LayoutTemplate newLayoutTemplate =
LayoutTemplateLocalServiceUtil.getLayoutTemplate( LayoutTemplateLocalServiceUtil.getLayoutTemplate(
layoutTemplateId, false, null); layoutTemplateId, false, null);
Expand Down