Author: tdraier
Date: Fri Jun 1 11:20:10 2007
New Revision: 17432
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17432&repname=
=3Djahia
Log:
display error message when no site selected (JAHIA-1950)
Added:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/n=
o_sites_selected.jsp
- copied, changed from r17367, branches/JAHIA-5-0-SP-BRANCH/core/src/=
webapp/jsp/jahia/administration/site_multiple_delete.jsp
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ExportEngine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/impo=
rtexport/ExportEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/importexport/ExportEngine.java&rev=
=3D17432&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ExportEngine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ExportEngine.java Fri Jun 1 11:20:10 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");
Copied: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administrati=
on/no_sites_selected.jsp (from r17367, branches/JAHIA-5-0-SP-BRANCH/core/sr=
c/webapp/jsp/jahia/administration/site_multiple_delete.jsp)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/no_sites_selected.jsp&rev=
=3D17432&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
ite_multiple_delete.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/n=
o_sites_selected.jsp Fri Jun 1 11:20:10 2007
@@ -21,14 +21,7 @@
<%@ page import=3D"java.util.List" %>
<%@ page import=3D"java.util.Vector" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
-<%
- final List sites =3D (List) request.getAttribute("sites");
=
- Vector usrProviders =3D (Vector) request.getAttribute("usrProviders");
- if (usrProviders =3D=3D null) {
- usrProviders =3D new Vector();
- }
-%>
=
<div id=3D"topTitle">
<div id=3D"topTitleLogo">
@@ -41,126 +34,9 @@
=
<div id=3D"adminMainContent">
=
-<% if (sites =3D=3D null || sites.size() =3D=3D 0) { %>
<div class=3D"error">
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Manage=
Sites.noSiteSpecified.label"/>
</div>
-<% } else { %>
-
-<form method=3D"POST" action=3D'<%=3DJahiaAdministration.composeActionURL(=
request,response,"sites","")%>' name=3D"mainForm">
-<input type=3D"hidden" name=3D"sub" value=3D"processmultipledelete"/>
-
-<p class=3D"errorbold"><jahia:adminResourceBundle
- resourceName=3D"org.jahia.admin.site.ManageSites.pleaseBeCareful.l=
abel"/></p>
-
-<h2><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Manage=
Sites.doYouWantToContinue.label"/></h2>
-
-<table border=3D"1" cellpadding=3D"10" cellspacing=3D"0" style=3D"width:10=
0%" class=3D"topAlignedTable">
- <tr>
- <th>
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.siteTitle.label"/>
- </th>
- <th>
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.siteServerName.label"/>
- </th>
- <th>
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.siteKey.label"/>
- </th>
- <th>
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.siteDesc.label"/>
- </th>
- </tr>
-
- <%
- for (Iterator iterator =3D sites.iterator(); iterator.hasNext();) {
- JahiaSite site =3D (JahiaSite) iterator.next();
- %>
- <input type=3D"hidden" name=3D"sitebox" value=3D"<%=3D site.getSiteKey=
() %>"/>
- <tr>
- <td>
- <%=3Dsite.getTitle()%>
- </td>
- <td>
- <%=3Dsite.getServerName()%>
- </td>
- <td>
- <%=3Dsite.getSiteKey()%>
- </td>
- <td>
- <%=3Dsite.getDescr()%>
- </td>
- </tr>
- <%
- }
- %>
-</table>
-<table>
- <tr>
- <td>
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.purgeOptions.label"/> :
- </td>
- <td>
- <table border=3D"0" cellpadding=3D"0" cellspacing=3D"0">
- <tr>
- <td>
- <input name=3D"deleteTemplates" type=3D"checkbox" =
value=3D"1" checked> <jahia:adminResourceBundle
- resourceName=3D"org.jahia.admin.site.ManageSit=
es.deleteSiteTemplates.label"/>
- </td>
- </tr>
- <tr>
- <td>
- <input name=3D"deleteFileRepository" type=3D"check=
box" value=3D"1" checked>
- <jahia:adminResourceBundle
- resourceName=3D"org.jahia.admin.site.Manag=
eSites.deleteSiteFileRepository.label"/>
- </td>
- </tr>
- <tr>
- <td>
- <br><br>
- <%
- if (usrProviders.size() > 0) {
- %>
- <jahia:adminResourceBundle
- resourceName=3D"org.jahia.admin.site.Manag=
eSites.deleteSiteUsersAndGroups.label"/> :
- <br>
- <%
- JahiaUserManagerProvider usrProviderBean;
- int size =3D usrProviders.size();
- for (int i =3D 0; i < size; i++) {
- usrProviderBean =3D (JahiaUserManagerProvi=
der) usrProviders.get(i);
- %>
- &n=
bsp;
- <input name=3D"usrProviders" type=3D"checkbox" val=
ue=3D"<%=3DusrProviderBean.getKey()%>" checked>
- <%=3DusrProviderBean.getKey()%>
- <%
- }
- }
- %>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-
-<div class=3D"buttonList" style=3D"text-align: right; padding-top: 30px; p=
adding-bottom: 10px">
- <div class=3D"button">
- <a href=3D'<%=3DJahiaAdministration.composeActionURL(request,respo=
nse,"sites","&sub=3Dlist")%>'>
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.can=
cel.label"/>
- </a>
- </div>
-
- <div class=3D"button">
- <a href=3D"javascript:document.mainForm.submit()"
- onclick=3D"openWorkInProgressWindow('<%=3Drequest.getContextPat=
h()%>')">
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.del=
ete.label"/>
- </a>
- </div>
-</div>
-
-</form>
-
-<% } %>
=
<div id=3D"operationMenu">
<div id=3D"operationMenuLabel">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
