Added patch for my account URL pointing to keycloak user acount URL

This commit is contained in:
Massimiliano Assante 2020-10-01 15:31:32 +02:00
parent 7c2d8d07c8
commit 7d5cf80c98
4 changed files with 25 additions and 9 deletions

13
CHANGELOG.md Normal file
View File

@ -0,0 +1,13 @@
# Changelog for invites-common-livrary
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v7.0.0-SNAPSHOT] - 2020-10-01
ported to git and added patch for my account URL pointing to keycloak user acount URL
## [v1.0.0] - 2015-10-06
First release

View File

@ -13,7 +13,7 @@
<artifactId>social-dockbar-hook</artifactId>
<packaging>war</packaging>
<name>social-dockbar-hook Hook</name>
<version>6.5.1-SNAPSHOT</version>
<version>7.0.0-SNAPSHOT</version>
<description>
This component is a Liferay 6.2.6 CE Hook which customise the dockbar adding the Dashboard Icon, Workspace, Catalogue etc.
</description>

View File

@ -1,6 +1,6 @@
name=social-dockbar-hook
module-group-id=liferay
module-incremental-version=8
module-incremental-version=9
tags=
short-description=
change-log=

View File

@ -129,12 +129,8 @@
}
%>
<%
String myAccountURL = themeDisplay.getURLMyAccount().toString();
myAccountURL = HttpUtil.setParameter(myAccountURL, "controlPanelCategory", PortletCategoryKeys.MY);
%>
<%//Patch for myProfile URL
<%//Patch for myProfile URL s
PortalContext context = PortalContext.getConfiguration();
String mySiteURL = context.getSiteLandingPagePath(request);
String myProfileURL = mySiteURL + GCubePortalConstants.USER_PROFILE_FRIENDLY_URL;
@ -146,7 +142,14 @@
<span class="badge site-type"><liferay-ui:message key="private" /></span>
</a>
</li>
<%//End Patch for myProfile URL %>
<%//End Patch for myProfile URL
//start patch for myAccount URL
//String myAccountURL = themeDisplay.getURLMyAccount().toString();
//myAccountURL = HttpUtil.setParameter(myAccountURL, "controlPanelCategory", PortletCategoryKeys.MY);
String myAccountURL = PrefsPropsUtil.getString(themeDisplay.getCompany().getCompanyId(), "d4science.oidc-user_account_url");
%>
<aui:nav-item href="<%= myAccountURL %>" iconCssClass="icon-user" label="my-account" title="my-account" useDialog="<%= PropsValues.DOCKBAR_ADMINISTRATIVE_LINKS_SHOW_IN_POP_UP %>" />
</c:if>