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.

Sign up for GitHub

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

LPS-64405 #38389

Closed
wants to merge 4 commits into from
Closed

LPS-64405 #38389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86b6c7a
LPS-64405 We do not need this hack anymore to handle portlets from th…
Mar 21, 2016
ddd928a
LPS-64405 Remove usages
Mar 21, 2016
0fbd3f6
LPS-64405 Properly handle the params both when publishing or copying …
Mar 21, 2016
aef2834
LPS-64405 Unrelated SF
Mar 21, 2016
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
26 changes: 5 additions & 21 deletions ...ort-import-service/src/main/java/com/liferay/exportimport/lar/ExportImportHelperImpl.java
View file
Open in desktop
Expand Up @@ -229,31 +229,15 @@ public DateRange getDateRange(
defaultRange);
}

/**
* @deprecated As of 7.0.0, with no direct replacement
*/
@Deprecated
@Override
public Layout getExportableLayout(ThemeDisplay themeDisplay)
throws PortalException {

Layout layout = themeDisplay.getLayout();

if (!layout.isTypeControlPanel()) {
return layout;
}

Group scopeGroup = themeDisplay.getScopeGroup();

if (scopeGroup.isLayout()) {
layout = _layoutLocalService.getLayout(scopeGroup.getClassPK());
}
else if (!scopeGroup.isCompany()) {
long defaultPlid = _layoutLocalService.getDefaultPlid(
themeDisplay.getSiteGroupId());

if (defaultPlid > 0) {
layout = _layoutLocalService.getLayout(defaultPlid);
}
}

return layout;
return themeDisplay.getLayout();
}

@Override
Expand Down
109 changes: 62 additions & 47 deletions ...ort/export-import-service/src/main/java/com/liferay/exportimport/staging/StagingImpl.java
View file
Open in desktop
Expand Up @@ -303,26 +303,17 @@ public long copyFromLive(PortletRequest portletRequest, Portlet portlet)
ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute(
WebKeys.THEME_DISPLAY);

long plid = ParamUtil.getLong(portletRequest, "plid");

Layout targetLayout = _layoutLocalService.getLayout(plid);

Group stagingGroup = targetLayout.getGroup();

Group liveGroup = stagingGroup.getLiveGroup();
long scopeGroupId = PortalUtil.getScopeGroupId(portletRequest);

Layout sourceLayout = _layoutLocalService.getLayoutByUuidAndGroupId(
targetLayout.getUuid(), liveGroup.getGroupId(),
targetLayout.isPrivateLayout());
long plid = ParamUtil.getLong(portletRequest, "plid");

Map<String, String[]> parameterMap =
ExportImportConfigurationParameterMapFactory.buildParameterMap(
portletRequest);

return publishPortlet(
themeDisplay.getUserId(), liveGroup.getGroupId(),
stagingGroup.getGroupId(), sourceLayout.getPlid(),
targetLayout.getPlid(), portlet.getPortletId(), parameterMap);
themeDisplay.getUserId(), scopeGroupId, plid,
portlet.getPortletId(), parameterMap, true);
}

/**
Expand Down Expand Up @@ -1678,45 +1669,20 @@ public long publishToLive(PortletRequest portletRequest)
public long publishToLive(PortletRequest portletRequest, Portlet portlet)
throws PortalException {

long plid = ParamUtil.getLong(portletRequest, "plid");

Layout sourceLayout = _layoutLocalService.getLayout(plid);

Group stagingGroup = null;
Group liveGroup = null;

Layout targetLayout = null;
ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute(
WebKeys.THEME_DISPLAY);

long scopeGroupId = PortalUtil.getScopeGroupId(portletRequest);

if (sourceLayout.isTypeControlPanel()) {
stagingGroup = _groupLocalService.fetchGroup(scopeGroupId);
liveGroup = stagingGroup.getLiveGroup();

targetLayout = sourceLayout;
}
else if (sourceLayout.hasScopeGroup() &&
(sourceLayout.getScopeGroup().getGroupId() == scopeGroupId)) {

stagingGroup = sourceLayout.getScopeGroup();
liveGroup = stagingGroup.getLiveGroup();

targetLayout = _layoutLocalService.getLayout(
liveGroup.getClassPK());
}
else {
stagingGroup = sourceLayout.getGroup();
liveGroup = stagingGroup.getLiveGroup();
long plid = ParamUtil.getLong(portletRequest, "plid");

targetLayout = _layoutLocalService.fetchLayoutByUuidAndGroupId(
sourceLayout.getUuid(), liveGroup.getGroupId(),
sourceLayout.isPrivateLayout());
}
Map<String, String[]> parameterMap =
ExportImportConfigurationParameterMapFactory.buildParameterMap(
portletRequest);

return copyPortlet(
portletRequest, stagingGroup.getGroupId(), liveGroup.getGroupId(),
sourceLayout.getPlid(), targetLayout.getPlid(),
portlet.getPortletId());
return publishPortlet(
themeDisplay.getUserId(), scopeGroupId, plid,
portlet.getPortletId(), parameterMap, false);
}

@Override
Expand Down Expand Up @@ -2627,6 +2593,55 @@ protected long publishLayouts(
return 0;
}

protected long publishPortlet(
long userId, long scopeGroupId, long plid, String portletId,
Map<String, String[]> parameterMap, boolean copyFromLive)
throws PortalException {

Layout sourceLayout = _layoutLocalService.getLayout(plid);

Group stagingGroup = null;
Group liveGroup = null;

Layout targetLayout = null;

if (sourceLayout.isTypeControlPanel()) {
stagingGroup = _groupLocalService.fetchGroup(scopeGroupId);
liveGroup = stagingGroup.getLiveGroup();

targetLayout = sourceLayout;
}
else if (sourceLayout.hasScopeGroup() &&
(sourceLayout.getScopeGroup().getGroupId() == scopeGroupId)) {

stagingGroup = sourceLayout.getScopeGroup();
liveGroup = stagingGroup.getLiveGroup();

targetLayout = _layoutLocalService.getLayout(
liveGroup.getClassPK());
}
else {
stagingGroup = sourceLayout.getGroup();
liveGroup = stagingGroup.getLiveGroup();

targetLayout = _layoutLocalService.fetchLayoutByUuidAndGroupId(
sourceLayout.getUuid(), liveGroup.getGroupId(),
sourceLayout.isPrivateLayout());
}

if (copyFromLive) {
return publishPortlet(
userId, liveGroup.getGroupId(), stagingGroup.getGroupId(),
targetLayout.getPlid(), sourceLayout.getPlid(), portletId,
parameterMap);
}

return publishPortlet(
userId, stagingGroup.getGroupId(), liveGroup.getGroupId(),
sourceLayout.getPlid(), targetLayout.getPlid(), portletId,
parameterMap);
}

/**
* @deprecated As of 7.0.0, with no direct replacement
*/
Expand Down
8 changes: 3 additions & 5 deletions .../export-import/export-import-web/src/main/resources/META-INF/resources/export_portlet.jsp
View file
Open in desktop
Expand Up @@ -19,8 +19,6 @@
<%
String tabs3 = ParamUtil.getString(request, "tabs3", "new-export-process");

Layout exportableLayout = ExportImportHelperUtil.getExportableLayout(themeDisplay);

PortletURL portletURL = renderResponse.createRenderURL();

portletURL.setParameter("mvcRenderCommandName", "exportImport");
Expand Down Expand Up @@ -81,7 +79,7 @@ portletURL.setParameter("portletResource", portletResource);
<aui:input name="tabs1" type="hidden" value="export_import" />
<aui:input name="tabs2" type="hidden" value="export" />
<aui:input name="redirect" type="hidden" value="<%= redirectURL %>" />
<aui:input name="plid" type="hidden" value="<%= exportableLayout.getPlid() %>" />
<aui:input name="plid" type="hidden" value="<%= plid %>" />
<aui:input name="groupId" type="hidden" value="<%= themeDisplay.getScopeGroupId() %>" />
<aui:input name="portletResource" type="hidden" value="<%= portletResource %>" />

Expand All @@ -96,7 +94,7 @@ portletURL.setParameter("portletResource", portletResource);
<%
PortletDataHandler portletDataHandler = selPortlet.getPortletDataHandlerInstance();

PortletDataHandlerControl[] configurationControls = portletDataHandler.getExportConfigurationControls(company.getCompanyId(), themeDisplay.getScopeGroupId(), selPortlet, exportableLayout.getPlid(), false);
PortletDataHandlerControl[] configurationControls = portletDataHandler.getExportConfigurationControls(company.getCompanyId(), themeDisplay.getScopeGroupId(), selPortlet, plid, false);
%>

<c:if test="<%= ArrayUtil.isNotEmpty(configurationControls) %>">
Expand Down Expand Up @@ -161,7 +159,7 @@ portletURL.setParameter("portletResource", portletResource);
<c:if test="<%= !portletDataHandler.isDisplayPortlet() %>">

<%
DateRange dateRange = ExportImportDateUtil.getDateRange(renderRequest, themeDisplay.getScopeGroupId(), false, exportableLayout.getPlid(), selPortlet.getPortletId(), ExportImportDateUtil.RANGE_ALL);
DateRange dateRange = ExportImportDateUtil.getDateRange(renderRequest, themeDisplay.getScopeGroupId(), false, plid, selPortlet.getPortletId(), ExportImportDateUtil.RANGE_ALL);

Date startDate = dateRange.getStartDate();
Date endDate = dateRange.getEndDate();
Expand Down
4 changes: 1 addition & 3 deletions ...port/export-import-web/src/main/resources/META-INF/resources/import_portlet_resources.jsp
View file
Open in desktop
Expand Up @@ -19,8 +19,6 @@
<%
String redirect = ParamUtil.getString(request, "redirect");

Layout exportableLayout = ExportImportHelperUtil.getExportableLayout(themeDisplay);

long groupId = ParamUtil.getLong(request, "groupId", scopeGroupId);

Group group = GroupLocalServiceUtil.fetchGroup(groupId);
Expand All @@ -47,7 +45,7 @@ ManifestSummary manifestSummary = ExportImportHelperUtil.getManifestSummary(them
<aui:input name="tabs1" type="hidden" value="export_import" />
<aui:input name="tabs2" type="hidden" value="import" />
<aui:input name="redirect" type="hidden" value="<%= importPortletRenderURL %>" />
<aui:input name="plid" type="hidden" value="<%= exportableLayout.getPlid() %>" />
<aui:input name="plid" type="hidden" value="<%= plid %>" />
<aui:input name="groupId" type="hidden" value="<%= groupId %>" />
<aui:input name="portletResource" type="hidden" value="<%= portletResource %>" />

Expand Down
4 changes: 1 addition & 3 deletions ...ort/export-import-web/src/main/resources/META-INF/resources/import_portlet_validation.jsp
View file
Open in desktop
Expand Up @@ -18,8 +18,6 @@

<%
String redirect = ParamUtil.getString(request, "redirect");

Layout exportableLayout = ExportImportHelperUtil.getExportableLayout(themeDisplay);
%>

<liferay-portlet:resourceURL copyCurrentRenderParameters="<%= false %>" id="exportImport" var="importPortletURL">
Expand Down Expand Up @@ -78,7 +76,7 @@ Layout exportableLayout = ExportImportHelperUtil.getExportableLayout(themeDispla
groupId: <%= scopeGroupId %>
}
},
uploadFile: '<liferay-portlet:actionURL doAsUserId="<%= user.getUserId() %>" name="exportImport"><portlet:param name="mvcRenderCommandName" value="exportImport" /><portlet:param name="<%= Constants.CMD %>" value="<%= Constants.ADD_TEMP %>" /><portlet:param name="redirect" value="<%= redirect %>" /><portlet:param name="plid" value="<%= String.valueOf(exportableLayout.getPlid()) %>" /><portlet:param name="groupId" value="<%= String.valueOf(themeDisplay.getScopeGroupId()) %>" /><portlet:param name="portletResource" value="<%= portletResource %>" /></liferay-portlet:actionURL>&ticketKey=<%= ticket.getKey() %><liferay-ui:input-permissions-params modelName="<%= Group.class.getName() %>" />'
uploadFile: '<liferay-portlet:actionURL doAsUserId="<%= user.getUserId() %>" name="exportImport"><portlet:param name="mvcRenderCommandName" value="exportImport" /><portlet:param name="<%= Constants.CMD %>" value="<%= Constants.ADD_TEMP %>" /><portlet:param name="redirect" value="<%= redirect %>" /><portlet:param name="plid" value="<%= String.valueOf(plid) %>" /> <portlet:param name="groupId" value="<%= String.valueOf(themeDisplay.getScopeGroupId()) %>" /><portlet:param name="portletResource" value="<%= portletResource %>" /></liferay-portlet:actionURL>&ticketKey=<%= ticket.getKey() %><liferay-ui:input-permissions-params modelName="<%= Group.class.getName() %>" />'
}
);

Expand Down
16 changes: 6 additions & 10 deletions ...export-import/export-import-web/src/main/resources/META-INF/resources/publish_portlet.jsp
View file
Open in desktop
Expand Up @@ -21,8 +21,6 @@
<%
String tabs3 = ParamUtil.getString(request, "tabs3", "new-publication-process");

Layout exportableLayout = ExportImportHelperUtil.getExportableLayout(themeDisplay);

String errorMessageKey = StringPool.BLANK;

Layout targetLayout = null;
Expand All @@ -37,7 +35,7 @@ if (!layout.isTypeControlPanel()) {
targetLayout = LayoutLocalServiceUtil.getLayout(liveGroup.getClassPK());
}
else {
targetLayout = LayoutLocalServiceUtil.getLayoutByUuidAndGroupId(exportableLayout.getUuid(), liveGroup.getGroupId(), exportableLayout.isPrivateLayout());
targetLayout = LayoutLocalServiceUtil.getLayoutByUuidAndGroupId(layout.getUuid(), liveGroup.getGroupId(), layout.isPrivateLayout());
}
}
catch (NoSuchLayoutException nsle) {
Expand Down Expand Up @@ -80,12 +78,10 @@ portletURL.setParameter("tabs3", "current-and-previous");
<liferay-util:include page="/export_import_error.jsp" servletContext="<%= application %>" />

<c:choose>
<c:when test="<%= (themeDisplay.getURLPublishToLive() == null) && !layout.isTypeControlPanel() %>">
</c:when>
<c:when test="<%= Validator.isNotNull(errorMessageKey) %>">
<liferay-ui:message key="<%= errorMessageKey %>" />
</c:when>
<c:otherwise>
<c:when test="<%= (themeDisplay.getURLPublishToLive() != null) || layout.isTypeControlPanel() %>">
<aui:nav-bar markupView="lexicon">
<aui:nav cssClass="navbar-nav">

Expand Down Expand Up @@ -137,7 +133,7 @@ portletURL.setParameter("tabs3", "current-and-previous");
<aui:form action="<%= publishPortletURL %>" cssClass="lfr-export-dialog" method="post" name="fm1" onSubmit='<%= "event.preventDefault(); " + renderResponse.getNamespace() + "publishToLive();" %>'>
<aui:input name="<%= Constants.CMD %>" type="hidden" value="<%= Constants.PUBLISH_TO_LIVE %>" />
<aui:input name="redirect" type="hidden" value="<%= redirectURL %>" />
<aui:input name="plid" type="hidden" value="<%= exportableLayout.getPlid() %>" />
<aui:input name="plid" type="hidden" value="<%= plid %>" />
<aui:input name="groupId" type="hidden" value="<%= themeDisplay.getScopeGroupId() %>" />
<aui:input name="portletResource" type="hidden" value="<%= portletResource %>" />

Expand All @@ -147,7 +143,7 @@ portletURL.setParameter("tabs3", "current-and-previous");
<%
PortletDataHandler portletDataHandler = selPortlet.getPortletDataHandlerInstance();

PortletDataHandlerControl[] configurationControls = portletDataHandler.getExportConfigurationControls(company.getCompanyId(), themeDisplay.getScopeGroupId(), selPortlet, exportableLayout.getPlid(), false);
PortletDataHandlerControl[] configurationControls = portletDataHandler.getExportConfigurationControls(company.getCompanyId(), themeDisplay.getScopeGroupId(), selPortlet, plid, false);
%>

<c:if test="<%= ArrayUtil.isNotEmpty(configurationControls) %>">
Expand Down Expand Up @@ -212,7 +208,7 @@ portletURL.setParameter("tabs3", "current-and-previous");
<c:if test="<%= !portletDataHandler.isDisplayPortlet() %>">

<%
DateRange dateRange = ExportImportDateUtil.getDateRange(renderRequest, themeDisplay.getScopeGroupId(), false, exportableLayout.getPlid(), selPortlet.getPortletId(), ExportImportDateUtil.RANGE_FROM_LAST_PUBLISH_DATE);
DateRange dateRange = ExportImportDateUtil.getDateRange(renderRequest, themeDisplay.getScopeGroupId(), false, plid, selPortlet.getPortletId(), ExportImportDateUtil.RANGE_FROM_LAST_PUBLISH_DATE);

Date startDate = dateRange.getStartDate();
Date endDate = dateRange.getEndDate();
Expand Down Expand Up @@ -551,6 +547,6 @@ portletURL.setParameter("tabs3", "current-and-previous");
Liferay.Util.toggleRadio('<portlet:namespace />rangeLastPublish', '', ['<portlet:namespace />startEndDate', '<portlet:namespace />rangeLastInputs']);
Liferay.Util.toggleRadio('<portlet:namespace />rangeLast', '<portlet:namespace />rangeLastInputs', ['<portlet:namespace />startEndDate']);
</aui:script>
</c:otherwise>
</c:when>
</c:choose>
</div>
4 changes: 4 additions & 0 deletions portal-kernel/src/com/liferay/exportimport/kernel/lar/ExportImportHelper.java
View file
Open in desktop
Expand Up @@ -155,6 +155,10 @@ public DateRange getDateRange(
long plid, String portletId, String defaultRange)
throws Exception;

/**
* @deprecated As of 7.0.0, with no direct replacement
*/
@Deprecated
public Layout getExportableLayout(ThemeDisplay themeDisplay)
throws PortalException;

Expand Down
4 changes: 4 additions & 0 deletions portal-kernel/src/com/liferay/exportimport/kernel/lar/ExportImportHelperUtil.java
View file
Open in desktop
Expand Up @@ -97,6 +97,10 @@ public static DateRange getDateRange(
defaultRange);
}

/**
* @deprecated As of 7.0.0, with no direct replacement
*/
@Deprecated
public static Layout getExportableLayout(ThemeDisplay themeDisplay)
throws PortalException {

Expand Down