Skip to content

Commit

Permalink
LPS-196191 Use getPortletDisplayName instead getTitle for the p_l_bac…
Browse files Browse the repository at this point in the history
…k_url_title parameter to be consistent
  • Loading branch information
BarbaraCabrera authored and brianchandotcom committed Sep 20, 2023
1 parent a95a96d commit 3a20639
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2303,7 +2303,7 @@ private String _getDraftLayoutURL(Layout layout) throws Exception {
return HttpComponentsUtil.addParameters(
PortalUtil.getLayoutFullURL(getDraftLayout(layout), themeDisplay),
"p_l_back_url", _getBackURL(), "p_l_back_url_title",
portletDisplay.getTitle(), "p_l_mode", Constants.EDIT);
portletDisplay.getPortletDisplayName(), "p_l_mode", Constants.EDIT);
}

private String _getFriendlyURLWarningURL() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public String getHref() {
return HttpComponentsUtil.addParameters(
PortalUtil.getLayoutFullURL(_draftLayout, themeDisplay),
"p_l_back_url", themeDisplay.getURLCurrent(),
"p_l_back_url_title", portletDisplay.getTitle(), "p_l_mode",
Constants.EDIT);
"p_l_back_url_title", portletDisplay.getPortletDisplayName(),
"p_l_mode", Constants.EDIT);
}
catch (Exception exception) {
if (_log.isDebugEnabled()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@ public List<DropdownItem> getActionDropdownItems() {
HttpComponentsUtil.addParameters(
PortalUtil.getLayoutFullURL(_draftLayout, _themeDisplay),
"p_l_back_url", _themeDisplay.getURLCurrent(),
"p_l_back_url_title", portletDisplay.getTitle(), "p_l_mode",
"p_l_back_url_title",
portletDisplay.getPortletDisplayName(), "p_l_mode",
Constants.EDIT));

dropdownItem.setIcon("pencil");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ public String getHref() {
return HttpComponentsUtil.addParameters(
PortalUtil.getLayoutFullURL(_draftLayout, _themeDisplay),
"p_l_back_url", _themeDisplay.getURLCurrent(),
"p_l_back_url_title", portletDisplay.getTitle(), "p_l_mode",
Constants.EDIT);
"p_l_back_url_title", portletDisplay.getPortletDisplayName(),
"p_l_mode", Constants.EDIT);
}
catch (Exception exception) {
if (_log.isDebugEnabled()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ public String getHref() {
return HttpComponentsUtil.addParameters(
layoutPrototypeGroup.getDisplayURL(themeDisplay, true),
"p_l_back_url", themeDisplay.getURLCurrent(),
"p_l_back_url_title", portletDisplay.getTitle());
"p_l_back_url_title",
portletDisplay.getPortletDisplayName());
}

return HttpComponentsUtil.addParameters(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ public String getHref() {
PortalUtil.getLayoutFullURL(
layout.fetchDraftLayout(), _themeDisplay),
"p_l_back_url", _themeDisplay.getURLCurrent(),
"p_l_back_url_title", portletDisplay.getTitle(), "p_l_mode",
Constants.EDIT);
"p_l_back_url_title", portletDisplay.getPortletDisplayName(),
"p_l_mode", Constants.EDIT);
}
catch (Exception exception) {
if (_log.isDebugEnabled()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,8 @@ hasUpdatePermission && _isShowDiscardDraftAction(),
HttpComponentsUtil.addParameters(
PortalUtil.getLayoutFullURL(_draftLayout, _themeDisplay),
"p_l_back_url", _themeDisplay.getURLCurrent(),
"p_l_back_url_title", portletDisplay.getTitle(), "p_l_mode",
"p_l_back_url_title",
portletDisplay.getPortletDisplayName(), "p_l_mode",
Constants.EDIT));
dropdownItem.setIcon("pencil");
dropdownItem.setLabel(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@ hasUpdatePermission && _isShowDiscardDraftAction(),
HttpComponentsUtil.addParameters(
layoutPrototypeGroup.getDisplayURL(_themeDisplay, true),
"p_l_back_url", _themeDisplay.getURLCurrent(),
"p_l_back_url_title", portletDisplay.getTitle()));
"p_l_back_url_title",
portletDisplay.getPortletDisplayName()));
dropdownItem.setIcon("pencil");
dropdownItem.setLabel(
LanguageUtil.get(_httpServletRequest, "edit"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ hasUpdatePermission && _isShowDiscardDraftAction(),
HttpComponentsUtil.addParameters(
PortalUtil.getLayoutFullURL(_draftLayout, _themeDisplay),
"p_l_back_url", _themeDisplay.getURLCurrent(),
"p_l_back_url_title", portletDisplay.getTitle(), "p_l_mode",
"p_l_back_url_title",
portletDisplay.getPortletDisplayName(), "p_l_mode",
Constants.EDIT));
dropdownItem.setIcon("pencil");
dropdownItem.setLabel(
Expand Down

0 comments on commit 3a20639

Please sign in to comment.