Author: sshyrkov
Date: Wed Nov 14 16:10:17 2007
New Revision: 19150
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19150&repname=
=3Djahia
Log:
Display a list of template sets when importing site
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/sites/M=
anageSites.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/import_choose.jsp
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/s=
ites/ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/admin/sites/ManageSites.java&rev=3D191=
50&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/sites/M=
anageSites.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/sites/M=
anageSites.java Wed Nov 14 16:10:17 2007
@@ -1922,6 +1922,9 @@
}
if (jParams.getSessionState().getAttribute("importsInfos") !=3D nu=
ll) {
if (!((Map)jParams.getSessionState().getAttribute("importsInfo=
s")).isEmpty()) {
+ request.setAttribute("tmplSets", ServicesRegistry.getInsta=
nce()
+ .getJahiaTemplateManagerService()
+ .getAvailableTemplatePackages());
JahiaAdministration.doRedirect(request, response, session,=
JSP_PATH + "import_choose.jsp");
return;
} else {
@@ -2085,14 +2088,9 @@
}
}
if (stillBad) {
-// SharedTemplatePackagesRegistry tmplSetReg =3D SharedTemplate=
PackagesRegistry.getInstance();
-// Enumeration en =3D tmplSetReg.getAllTemplatePackages();
-// List list =3D new ArrayList();
-// while (en.hasMoreElements()) {
-// list.add(en.nextElement());
-// }
- // TODO properly pol=C3=BAlate templates list
- request.setAttribute("tmplSets", Collections.EMPTY_LIST);
+ request.setAttribute("tmplSets", ServicesRegistry.getInstance()
+ .getJahiaTemplateManagerService()
+ .getAvailableTemplatePackages());
=
JahiaAdministration.doRedirect(request, response, session, JSP=
_PATH + "import_choose.jsp");
} else {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/admin=
istration/import_choose.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/administration/import_choose.jsp&rev=
=3D19150&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-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/import_choose.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/import_choose.jsp Wed Nov 14 16:10:17 2007
@@ -17,7 +17,6 @@
--%><[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" %>
@@ -30,14 +29,6 @@
<%
Map importsInfos =3D (Map) session.getAttribute("importsInfos");
List tpls =3D (List) request.getAttribute("tmplSets");
-// if (tpls =3D=3D null) {
-// SharedTemplatePackagesRegistry tmplSetReg =3D
SharedTemplatePackages=
Registry.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) {
@@ -129,7 +120,7 @@
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>
+ %> <option value=3D"<%=3Dpack.getName()%>"=
<% if (pack.getName().equals(infos.get("templates"))) {%>selected<% } %>><=
%=3Dpack.getName()%></option>
<%
}
%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
