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

[TS] LPS-144086 | "View" button appeared in the Asset Publisher when using URL to reach it #6883

Closed
wants to merge 1 commit into from
Closed

[TS] LPS-144086 | "View" button appeared in the Asset Publisher when using URL to reach it #6883

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions ...asset-publisher-web/src/main/resources/META-INF/resources/view_asset_entries_abstract.jsp
View file
Open in desktop
Expand Up @@ -62,8 +62,7 @@ for (AssetEntry assetEntry : assetEntryResult.getAssetEntries()) {
try {
String title = assetRenderer.getTitle(LocaleUtil.fromLanguageId(LanguageUtil.getLanguageId(request)));

String viewURL = HttpUtil.addParameter(assetPublisherHelper.getAssetViewURL(liferayPortletRequest, liferayPortletResponse, assetRenderer, assetEntry, assetPublisherDisplayContext.isAssetLinkBehaviorViewInPortlet()), liferayPortletResponse.getNamespace() + "viewSingleAsset", true);

String viewURL = assetPublisherHelper.getAssetViewURL(liferayPortletRequest, liferayPortletResponse, assetRenderer, assetEntry, assetPublisherDisplayContext.isAssetLinkBehaviorViewInPortlet());
Map<String, Object> fragmentsEditorData = HashMapBuilder.<String, Object>put(
"fragments-editor-item-id", PortalUtil.getClassNameId(assetRenderer.getClassName()) + "-" + assetRenderer.getClassPK()
).put(
Expand Down
4 changes: 3 additions & 1 deletion ...t-publisher-web/src/main/resources/META-INF/resources/view_asset_entries_full_content.jsp
View file
Open in desktop
Expand Up @@ -61,7 +61,9 @@ for (AssetEntry assetEntry : assetEntryResult.getAssetEntries()) {
request.setAttribute("view.jsp-assetRendererFactory", assetRendererFactory);
%>

<liferay-util:include page="/view_asset_entry_full_content.jsp" servletContext="<%= application %>" />
<liferay-util:include page="/view_asset_entry_full_content.jsp" servletContext="<%= application %>">
<liferay-util:param name="viewSingleAsset" value="false" />
</liferay-util:include>

<%
}
Expand Down
2 changes: 1 addition & 1 deletion ...et/asset-publisher-web/src/main/resources/META-INF/resources/view_asset_entries_table.jsp
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@ if (stageableGroup.isLayout()) {
continue;
}

String viewURL = HttpUtil.addParameter(assetPublisherHelper.getAssetViewURL(liferayPortletRequest, liferayPortletResponse, assetRenderer, assetEntry, assetPublisherDisplayContext.isAssetLinkBehaviorViewInPortlet()), liferayPortletResponse.getNamespace() + "viewSingleAsset", true);
String viewURL = assetPublisherHelper.getAssetViewURL(liferayPortletRequest, liferayPortletResponse, assetRenderer, assetEntry, assetPublisherDisplayContext.isAssetLinkBehaviorViewInPortlet());

request.setAttribute("view.jsp-assetEntry", assetEntry);
request.setAttribute("view.jsp-assetRenderer", assetRenderer);
Expand Down
3 changes: 1 addition & 2 deletions ...set-publisher-web/src/main/resources/META-INF/resources/view_asset_entries_title_list.jsp
View file
Open in desktop
Expand Up @@ -86,8 +86,7 @@ AssetEntryResult assetEntryResult = (AssetEntryResult)request.getAttribute("view
<p class="h4 list-group-title text-truncate">
<span class="asset-anchor lfr-asset-anchor" id="<%= assetEntry.getEntryId() %>"></span>

<aui:a href='<%= HttpUtil.addParameter(assetPublisherHelper.getAssetViewURL(liferayPortletRequest, liferayPortletResponse, assetRenderer, assetEntry, assetPublisherDisplayContext.isAssetLinkBehaviorViewInPortlet()), liferayPortletResponse.getNamespace() + "viewSingleAsset", true) %>'>
<%= HtmlUtil.escape(assetEntry.getTitle(locale)) %>
<aui:a href="<%= assetPublisherHelper.getAssetViewURL(liferayPortletRequest, liferayPortletResponse, assetRenderer, assetEntry, assetPublisherDisplayContext.isAssetLinkBehaviorViewInPortlet()) %>"> <%= HtmlUtil.escape(assetEntry.getTitle(locale)) %>
</aui:a>
</p>

Expand Down
4 changes: 2 additions & 2 deletions ...set-publisher-web/src/main/resources/META-INF/resources/view_asset_entry_full_content.jsp
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@ long previewClassNameId = ParamUtil.getLong(request, "previewClassNameId");
long previewClassPK = ParamUtil.getLong(request, "previewClassPK");

boolean print = GetterUtil.getBoolean(request.getAttribute("view.jsp-print"));
boolean viewSingleAsset = ParamUtil.getBoolean(request, "viewSingleAsset");
boolean viewSingleAsset = ParamUtil.getBoolean(request, "viewSingleAsset", true);

assetPublisherDisplayContext.setLayoutAssetEntry(assetEntry);

Expand All @@ -57,7 +57,7 @@ if (print) {
viewFullContentURL.setParameter("viewMode", Constants.PRINT);
}

String viewInContextURL = HttpUtil.addParameter(assetRenderer.getURLViewInContext(liferayPortletRequest, liferayPortletResponse, HttpUtil.setParameter(viewFullContentURL.toString(), "redirect", currentURL)), liferayPortletResponse.getNamespace() + "viewSingleAsset", true);
String viewInContextURL = assetRenderer.getURLViewInContext(liferayPortletRequest, liferayPortletResponse, HttpUtil.setParameter(viewFullContentURL.toString(), "redirect", currentURL));

Map<String, Object> fragmentsEditorData = HashMapBuilder.<String, Object>put(
"fragments-editor-item-id", PortalUtil.getClassNameId(assetRenderer.getClassName()) + "-" + assetRenderer.getClassPK()
Expand Down