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
This commit is contained in:
parent
daad41d0e9
commit
98cdbaa6ce
|
@ -10,6 +10,7 @@ import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
import javax.servlet.http.HttpSession;
|
import javax.servlet.http.HttpSession;
|
||||||
|
|
||||||
import org.gcube.datacatalogue.ckanutillibrary.CKanUtils;
|
import org.gcube.datacatalogue.ckanutillibrary.CKanUtils;
|
||||||
import org.gcube.datacatalogue.ckanutillibrary.models.RolesIntoOrganization;
|
import org.gcube.datacatalogue.ckanutillibrary.models.RolesIntoOrganization;
|
||||||
import org.gcube.datacatalogue.metadatadiscovery.DataCalogueMetadataFormatReader;
|
import org.gcube.datacatalogue.metadatadiscovery.DataCalogueMetadataFormatReader;
|
||||||
|
@ -39,6 +40,8 @@ import org.gcube.vomanagement.usermanagement.model.GatewayRolesNames;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import eu.trentorise.opendata.jackan.model.CkanLicense;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class UserUtil.
|
* The Class UserUtil.
|
||||||
|
@ -292,8 +295,18 @@ public class UserUtil {
|
||||||
|
|
||||||
try{
|
try{
|
||||||
logger.debug("User in session is " + username);
|
logger.debug("User in session is " + username);
|
||||||
List<String> titlesLicenses = ckanUtils.getLicenseTitles();
|
|
||||||
LicensesBean licensesBean = new LicensesBean(titlesLicenses);
|
List<CkanLicense> titlesLicenses = ckanUtils.getLicenses();
|
||||||
|
List<String> titles = new ArrayList<String>();
|
||||||
|
List<String> urls = new ArrayList<String>();
|
||||||
|
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);
|
session.setAttribute(ckanLicensesKey, licensesBean);
|
||||||
logger.info("List of licenses has been saved into session" + licensesBean);
|
logger.info("List of licenses has been saved into session" + licensesBean);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue