From 98cdbaa6ce6dc6decf4941104f374cca394c49af Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Wed, 13 Jul 2016 16:16:31 +0000 Subject: [PATCH] minor fix git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@130325 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gcubeckandatacatalog/server/UserUtil.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java index 6eaf5c4..05ee9a8 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java @@ -10,6 +10,7 @@ import java.util.Map; import java.util.Map.Entry; import javax.servlet.http.HttpSession; + import org.gcube.datacatalogue.ckanutillibrary.CKanUtils; import org.gcube.datacatalogue.ckanutillibrary.models.RolesIntoOrganization; import org.gcube.datacatalogue.metadatadiscovery.DataCalogueMetadataFormatReader; @@ -39,6 +40,8 @@ import org.gcube.vomanagement.usermanagement.model.GatewayRolesNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import eu.trentorise.opendata.jackan.model.CkanLicense; + /** * The Class UserUtil. @@ -292,8 +295,18 @@ public class UserUtil { try{ logger.debug("User in session is " + username); - List titlesLicenses = ckanUtils.getLicenseTitles(); - LicensesBean licensesBean = new LicensesBean(titlesLicenses); + + List titlesLicenses = ckanUtils.getLicenses(); + List titles = new ArrayList(); + List urls = new ArrayList(); + for (CkanLicense license : titlesLicenses) { + titles.add(license.getTitle()); + + String url = (license.getUrl() != null && !license.getUrl().isEmpty()) ? license.getUrl() : ""; + urls.add(url); + } + LicensesBean licensesBean = new LicensesBean(titles, urls); + session.setAttribute(ckanLicensesKey, licensesBean); logger.info("List of licenses has been saved into session" + licensesBean);