cmailleux 2006/01/04 18:22:18 CET
Modified files:
core/src/java/org/jahia/admin/homepages HomePageTool.java
Log:
Correctly get the page title
Revision Changes Path
1.5 +11 -10
jahia/core/src/java/org/jahia/admin/homepages/HomePageTool.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/admin/homepages/HomePageTool.java.diff?r1=1.4&r2=1.5&f=h
Index: HomePageTool.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/admin/homepages/HomePageTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HomePageTool.java 5 Jul 2005 15:45:52 -0000 1.4
+++ HomePageTool.java 4 Jan 2006 17:22:18 -0000 1.5
@@ -40,21 +40,13 @@
package org.jahia.admin.homepages;
-import java.io.IOException;
-import java.util.*;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import org.jahia.bin.Jahia;
import org.jahia.bin.JahiaAdministration;
import org.jahia.data.JahiaData;
import org.jahia.engines.selectpage.SelectPage_Engine;
import org.jahia.exceptions.JahiaException;
-import org.jahia.params.ProcessingContext;
import org.jahia.params.HttpSessionState;
+import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
import org.jahia.resourcebundle.JahiaResourceBundle;
import org.jahia.services.fields.ContentField;
@@ -68,6 +60,15 @@
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.utils.LanguageCodeConverters;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* desc: This class is used by the administration to choose an home page.
*
@@ -266,7 +267,7 @@
JahiaHomepageLink homePageLink =
(JahiaHomepageLink)homePage;
session.setAttribute ("homePageID", new Integer
(homePageLink.getPageID ()));
session.setAttribute ("homePageLabel",
JahiaPageBaseService.
- getInstance ().lookupPageWhitoutTemplates
(homePageLink.getPageID ()).getTitle ());
+ getInstance
().lookupContentPage(homePageLink.getPageID
(),false).getPage(Jahia.getThreadParamBean()).getTitle ());
} else if (homePage.getType () ==
HomepageTypes.HOMEPAGE_NEW) {
//
} else if (homePage.getType () ==
HomepageTypes.HOMEPAGE_COPY) {
