From f2db17001e76031eadaf2a87dd1ec2c6a8d93506 Mon Sep 17 00:00:00 2001 From: Zulqarnain Date: Wed, 15 Feb 2023 18:45:00 +0500 Subject: [PATCH] dotCMS/core#23955 show preview button only when content url link is available --- .../portlet/ext/contentlet/contentlet_actions_inc.jsp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/contentlet_actions_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/contentlet_actions_inc.jsp index 405c59a1e7a2..99fd6362efd2 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/contentlet_actions_inc.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/contentlet_actions_inc.jsp @@ -61,11 +61,13 @@ boolean canUserWriteToContentlet = conPerAPI.doesUserHavePermission(contentlet,P String previewUrl = null; +String contentUrl = null; if(contentlet.isHTMLPage() && UtilMethods.isSet(contentlet.getIdentifier())){ - previewUrl= "/dotAdmin/#/edit-page/content?url=" + APILocator.getIdentifierAPI().find(contentlet.getIdentifier()).getURI() + "&language_id=" + contentlet.getLanguageId(); + contentUrl = APILocator.getIdentifierAPI().find(contentlet.getIdentifier()).getURI(); + previewUrl= "/dotAdmin/#/edit-page/content?url=" + contentUrl + "&language_id=" + contentlet.getLanguageId(); }else{ - - previewUrl = "/dotAdmin/#/edit-page/content?url=" + APILocator.getContentletAPI().getUrlMapForContentlet(contentlet, user, PageMode.get(request).respectAnonPerms) + "&language_id=" + contentlet.getLanguageId(); + contentUrl = APILocator.getContentletAPI().getUrlMapForContentlet(contentlet, user, PageMode.get(request).respectAnonPerms); + previewUrl = "/dotAdmin/#/edit-page/content?url=" + contentUrl + "&language_id=" + contentlet.getLanguageId(); } if(myHost.getIdentifier() != null){ @@ -148,7 +150,7 @@ function jumpToContentType(){ <%--check permissions to display the save and publish button or not--%> -<%if(!"edit-page".equals(request.getParameter("angularCurrentPortlet")) && UtilMethods.isSet(previewUrl)) {%> +<%if(!"edit-page".equals(request.getParameter("angularCurrentPortlet")) && UtilMethods.isSet(contentUrl)) {%>
<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "editpage.toolbar.preview.page")) %>