Updated Rules
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@114367 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
f7fd6729f7
commit
52cfd0a8b2
|
@ -17,6 +17,7 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
|
||||||
import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession;
|
import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession;
|
||||||
import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession;
|
import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession;
|
||||||
import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager;
|
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.chart.ChartTopRatingSession;
|
import org.gcube.portlets.user.td.gwtservice.shared.chart.ChartTopRatingSession;
|
||||||
import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
|
import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
|
||||||
import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
|
import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
|
||||||
|
@ -89,8 +90,8 @@ public class SessionUtil {
|
||||||
ASLSession session;
|
ASLSession session;
|
||||||
if (username == null) {
|
if (username == null) {
|
||||||
logger.warn("no user found in session, using test one");
|
logger.warn("no user found in session, using test one");
|
||||||
throw new TDGWTSessionExpiredException("Session Expired!");
|
/*throw new TDGWTSessionExpiredException("Session Expired!");*/
|
||||||
/*
|
|
||||||
// Remove comment for Test
|
// Remove comment for Test
|
||||||
username = Constants.DEFAULT_USER;
|
username = Constants.DEFAULT_USER;
|
||||||
String scope = Constants.DEFAULT_SCOPE;
|
String scope = Constants.DEFAULT_SCOPE;
|
||||||
|
@ -99,7 +100,7 @@ public class SessionUtil {
|
||||||
session = SessionManager.getInstance().getASLSession(
|
session = SessionManager.getInstance().getASLSession(
|
||||||
httpSession.getId(), username);
|
httpSession.getId(), username);
|
||||||
session.setScope(scope);
|
session.setScope(scope);
|
||||||
*/
|
|
||||||
} else {
|
} else {
|
||||||
session = SessionManager.getInstance().getASLSession(
|
session = SessionManager.getInstance().getASLSession(
|
||||||
httpSession.getId(), username);
|
httpSession.getId(), username);
|
||||||
|
|
|
@ -104,6 +104,15 @@ public class RuleDescriptionData implements Serializable {
|
||||||
public void setContacts(ArrayList<Contacts> contacts) {
|
public void setContacts(ArrayList<Contacts> contacts) {
|
||||||
this.contacts = contacts;
|
this.contacts = contacts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ArrayList<String> getContactsAsStringList(){
|
||||||
|
ArrayList<String> contactsList=new ArrayList<String>();
|
||||||
|
for(Contacts contact:contacts){
|
||||||
|
contactsList.add(contact.getLogin());
|
||||||
|
}
|
||||||
|
return contactsList;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public RuleScopeType getScope() {
|
public RuleScopeType getScope() {
|
||||||
return scope;
|
return scope;
|
||||||
|
|
Loading…
Reference in New Issue