diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java index 776c76f..71e11f2 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java @@ -16,6 +16,7 @@ import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; @@ -77,15 +78,15 @@ public class SessionUtil { ASLSession session; if (username == null) { logger.warn("no user found in session, using test one"); - throw new TDGWTSessionExpiredException("Session Expired!"); - /* + //throw new TDGWTSessionExpiredException("Session Expired!"); + username = Constants.DEFAULT_USER; String scope = Constants.DEFAULT_SCOPE; httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username); session = SessionManager.getInstance().getASLSession( httpSession.getId(), username); - session.setScope(scope);*/ + session.setScope(scope); } else { session = SessionManager.getInstance().getASLSession( diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistDefColumn.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistDefColumn.java index d4a41d1..2ec569d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistDefColumn.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistDefColumn.java @@ -12,7 +12,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeC public class ExtractCodelistDefColumn implements Serializable { private static final long serialVersionUID = 7467523779864189492L; - + + protected int id; //Only for grid or combo protected ColumnTypeCode columnType; protected String defaultValue; protected String label; @@ -21,7 +22,7 @@ public class ExtractCodelistDefColumn implements Serializable { } - public ExtractCodelistDefColumn(ColumnTypeCode columnType, + public ExtractCodelistDefColumn(int id, ColumnTypeCode columnType, String defaultValue, String label) { this.columnType=columnType; this.defaultValue=defaultValue; @@ -52,10 +53,21 @@ public class ExtractCodelistDefColumn implements Serializable { this.defaultValue = defaultValue; } - @Override - public String toString() { - return "ExtractCodelistDefColumn [columnType=" + columnType - + ", defaultValue=" + defaultValue + ", label=" + label + "]"; + public int getId() { + return id; } + public void setId(int id) { + this.id = id; + } + + @Override + public String toString() { + return "ExtractCodelistDefColumn [id=" + id + ", columnType=" + + columnType + ", defaultValue=" + defaultValue + ", label=" + + label + "]"; + } + + + }