diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java index 5541daf..522e7ae 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java @@ -28,6 +28,8 @@ import org.gcube.vomanagement.usermanagement.exception.UserRetrievalFault; import org.gcube.vomanagement.usermanagement.impl.LiferayUserManager; import org.gcube.vomanagement.usermanagement.model.GCubeUser; +import eu.trentorise.opendata.jackan.model.CkanLicense; + /** * The Class UserUtil. @@ -180,11 +182,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); - } catch(Exception e){ logger.error("Failed to preload licenses list", e);