From 5645ceafab24839c212fdbd34ff33d52c9b03ad2 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 22 Apr 2014 10:28:04 +0000 Subject: [PATCH] fixed open template bug when not in VME Mode git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@95030 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/servlet/ReportServiceImpl.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java index a4989e8..abb425c 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java @@ -33,10 +33,7 @@ import org.apache.commons.io.IOUtils; import org.gcube.application.framework.accesslogger.library.impl.AccessLogger; import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.SessionManager; -import org.gcube.application.reporting.ReportsModeler; -import org.gcube.application.reporting.component.interfaces.ReportComponent; import org.gcube.application.reporting.reader.ModelReader; -import org.gcube.application.reporting.reader.Section; import org.gcube.application.rsg.client.RsgClient; import org.gcube.application.rsg.service.RsgService; import org.gcube.application.rsg.service.dto.ReportEntry; @@ -46,7 +43,6 @@ import org.gcube.application.rsg.service.dto.response.ResponseEntry; import org.gcube.application.rsg.support.builder.exceptions.ReportBuilderException; import org.gcube.application.rsg.support.builder.impl.ReportManagerReportBuilder; import org.gcube.application.rsg.support.model.components.impl.CompiledReport; -import org.gcube.application.rsg.support.model.utils.CompiledReportUtils; import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager; import org.gcube.applicationsupportlayer.social.NotificationsManager; import org.gcube.common.homelibrary.home.HomeLibrary; @@ -100,7 +96,6 @@ import org.gcube.portlets.widgets.exporter.shared.SaveReportFileExistException; import org.gcube.portlets.widgets.exporter.shared.TypeExporter; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; -import org.junit.After; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -126,7 +121,8 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe */ private boolean withinPortal = true; - private static final String TEST_SCOPE = "/gcube/devsec/devVRE"; + //private static final String TEST_SCOPE = "/gcube/devsec/devVRE"; + private static final String TEST_SCOPE = "/gcube/devNext/NextNext"; /** @@ -385,8 +381,10 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe OpenReportLogEntry logEntry = new OpenReportLogEntry(toReturn.getTemplateName(), templateObjectID); log.logEntry(getASLSession().getUsername(), getASLSession().getScopeName(), logEntry); - ModelReader reader = new ModelReader(toReturn); - System.out.println(reader); + if (! isTemplate) { + ModelReader reader = new ModelReader(toReturn); + System.out.println(reader); + } return toReturn; }