From cc9f8f479fb0cf8374aa0168ac5d57bd64e55633 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Wed, 13 Oct 2021 09:13:23 +0200
Subject: [PATCH] minor bug fixed

---
 .../user/cataloguebadge/PortletViewController.java         | 1 +
 .../webapp/WEB-INF/jsp/Catalogue-badge-portlet/view.jsp    | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/cataloguebadge/PortletViewController.java b/src/main/java/org/gcube/portlets/user/cataloguebadge/PortletViewController.java
index 30272a0..807b8cd 100644
--- a/src/main/java/org/gcube/portlets/user/cataloguebadge/PortletViewController.java
+++ b/src/main/java/org/gcube/portlets/user/cataloguebadge/PortletViewController.java
@@ -68,6 +68,7 @@ public class PortletViewController {
 		model.addAttribute("releaseInfo", ReleaseInfo.getReleaseInfo());
 		PortletPreferences prefs = request.getPreferences();
 		String catalogueBaseURL = GetterUtil.getString(prefs.getValue("catalogueURL", StringPool.BLANK));
+		model.addAttribute("catalogueActualURL", catalogueBaseURL);
 		HttpServletRequest httpServletRequest = PortalUtil.getHttpServletRequest(request);
 		long groupId = -1;
 		boolean isRootVO = false;
diff --git a/src/main/webapp/WEB-INF/jsp/Catalogue-badge-portlet/view.jsp b/src/main/webapp/WEB-INF/jsp/Catalogue-badge-portlet/view.jsp
index 69d1d63..66ab1a3 100644
--- a/src/main/webapp/WEB-INF/jsp/Catalogue-badge-portlet/view.jsp
+++ b/src/main/webapp/WEB-INF/jsp/Catalogue-badge-portlet/view.jsp
@@ -5,17 +5,12 @@
 <%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %>
 <%@ taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %>
 <%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
-<%@ page import="javax.portlet.PortletPreferences" %>
 <%@ page import="com.liferay.portal.kernel.util.Constants" %>
 <%@ page import="com.liferay.portal.kernel.util.GetterUtil" %>
 <%@ page import="com.liferay.portal.kernel.util.StringPool" %>
 <%@ page import="com.liferay.portal.util.PortalUtil" %>
 
-<% 
-PortletPreferences prefs = request.getPreferences();
-String catalogueActualURL = GetterUtil.getString(prefs.getValue("catalogueURL", StringPool.BLANK)); 
-pageContext.setAttribute("catalogueActualURL", catalogueActualURL);
-%>
+
 	<!-- show the types only when the ckan instance is specified in the config portlet part  -->
 <c:choose>
 	<c:when test="${not empty catalogueActualURL}">