Author: tdraier
Date: Mon Jun 25 15:00:53 2007
New Revision: 17747
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17747&repname=
=3Djahia
Log:
display error message when no site selected (JAHIA-1950) ( backport 17432 )
Added:
trunk/core/src/webapp/jsp/jahia/administration/no_sites_selected.jsp
- copied unchanged from r17432, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/jsp/jahia/administration/no_sites_selected.jsp
Modified:
trunk/core/src/java/org/jahia/engines/importexport/ExportEngine.java
Modified: trunk/core/src/java/org/jahia/engines/importexport/ExportEngine.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/importexport/ExportEngine.java&rev=3D17747&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/engines/importexport/ExportEngine.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/engines/importexport/ExportEngine.java Mo=
n Jun 25 15:00:53 2007
@@ -34,6 +34,8 @@
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.taglibs.esi.JesiConst;
+import org.jahia.bin.JahiaAdministration;
+import org.jahia.admin.sites.ManageSites;
=
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
@@ -103,7 +105,8 @@
}
=
private void export(ProcessingContext processingContext) throws Except=
ion {
- HttpServletResponse resp =3D ((ParamBean)processingContext).getRea=
lResponse();
+ ParamBean jParams =3D (ParamBean) processingContext;
+ HttpServletResponse resp =3D jParams.getRealResponse();
ServletOutputStream outputStream =3D resp.getOutputStream();
//make sure this file is not cached by the client (or a proxy midd=
leman)
resp.setHeader("Expires", "Thu, 01 Jan 1970 00:00:00 GMT");
@@ -151,14 +154,20 @@
sites.add(site);
}
}
- resp.setContentType("application/zip");
- params.put(ImportExportService.INCLUDE_ALL_FILES, Boolean.TRUE=
);
- params.put(ImportExportService.INCLUDE_TEMPLATES, Boolean.TRUE=
);
- params.put(ImportExportService.INCLUDE_SITE_INFOS, Boolean.TRU=
E);
- params.put(ImportExportService.VIEW_WORKFLOW, Boolean.TRUE);
=
- ie.exportSites(outputStream, params, processingContext, sites);
- outputStream.close();
+ if (sites.isEmpty()) {
+ JahiaAdministration.doRedirect(jParams.getRequest(), jPara=
ms.getResponse(), jParams.getSession(),
+ JahiaAdministration.JSP_PATH + "no_sites_selected.=
jsp");
+ } else {
+ resp.setContentType("application/zip");
+ params.put(ImportExportService.INCLUDE_ALL_FILES, Boolean.=
TRUE);
+ params.put(ImportExportService.INCLUDE_TEMPLATES, Boolean.=
TRUE);
+ params.put(ImportExportService.INCLUDE_SITE_INFOS, Boolean=
.TRUE);
+ params.put(ImportExportService.VIEW_WORKFLOW, Boolean.TRUE=
);
+
+ ie.exportSites(outputStream, params, processingContext, si=
tes);
+ outputStream.close();
+ }
return;
} else if ("cats".equals(processingContext.getParameter("exportfor=
mat"))) {
resp.setContentType("text/xml");
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
