Author: rfelden
Date: Thu Oct 11 16:29:35 2007
New Revision: 18839
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18839&repname=
=3Djahia
Log:
Fixed a NPE when performing an import after having cancelled the operation =
(using 'back to site list' link).
Available templates list is stored in the request but it shouldn't.
(JAHIA-2436)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/i=
mport_choose.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/import_choose.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/import_choose.jsp&rev=3D18=
839&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/i=
mport_choose.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/i=
mport_choose.jsp Thu Oct 11 16:29:35 2007
@@ -17,6 +17,7 @@
--%><[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%>
<[EMAIL PROTECTED] import=3D"org.jahia.bin.JahiaAdministration"%>
<%@ page import=3D"org.jahia.params.ProcessingContext"%>
+<%@ page import=3D"org.jahia.registries.SharedTemplatePackagesRegistry"%>
<%@ page import=3D"org.jahia.services.pages.ContentPage"%>
<%@ page import=3D"java.text.DateFormat" %>
<%@ page import=3D"java.text.SimpleDateFormat" %>
@@ -29,13 +30,19 @@
<%
Map importsInfos =3D (Map) session.getAttribute("importsInfos");
List tpls =3D (List) request.getAttribute("tmplSets");
+ if (tpls =3D=3D null) {
+ SharedTemplatePackagesRegistry tmplSetReg =3D
SharedTemplatePackagesRe=
gistry.getInstance();
+ Enumeration en =3D tmplSetReg.getAllTemplatePackages();
+ tpls =3D new ArrayList();
+ while (en.hasMoreElements()) {
+ tpls.add(en.nextElement());
+ }
+ }
JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.data.J=
ahiaData");
ProcessingContext jParams =3D null;
if (jData !=3D null) {
jParams =3D jData.params();
}
-
-
%>
=
<div id=3D"topTitle">
@@ -119,6 +126,7 @@
<% if (infos.get("templatesAvailable")!=3D null) {=
%>
<option value=3D"" <% if ("".equals(infos.get("tem=
plates"))) {%>selected<% } %>><jahia:adminResourceBundle resourceName=3D"or=
g.jahia.admin.site.ManageSites.multipleimport.defaultTemplate"/></option>
<%}
+ if (tpls !=3D null)
for (Iterator iterator1 =3D tpls.iterator(); i=
terator1.hasNext();) {
JahiaTemplatesPackage pack =3D (JahiaTempl=
atesPackage) iterator1.next();
%> <option value=3D"<%=3Dpack.getFileName(=
)%>" <% if (pack.getFileName().equals(infos.get("templates"))) {%>selected<=
% } %>><%=3Dpack.getName()%></option>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
