Author: bpapez
Date: Wed Jan 2 19:02:38 2008
New Revision: 19444
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19444&repname=
=3Djahia
Log:
MEY-42 : npe fix (select home page with pages filter)
Modified:
trunk/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/selectpage/select_page.jsp&rev=3D19444&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/webapp/jsp/jahia/engines/selectpage/select_page.jsp (ori=
ginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp Wed =
Jan 2 19:02:38 2008
@@ -294,9 +294,12 @@
"&sitemap=3Dsort|" + actualLanguageCode + "|";
int sortOrder =3D flatJahiaSiteMap.getSortOrder() =3D=3D FlatSiteMapVi=
ewHelper.ASCENDING_ORDER ?
FlatSiteMapViewHelper.DESCENDING_ORDER : FlatSiteMapViewHelper=
.ASCENDING_ORDER;
- final PagesFilter pagesFilter =3D JahiaSiteMapService.getCurrentPagesF=
ilter(
- (JahiaField)((Map)jParams.getSessionState().getAttribute("jahi=
a_session_engineMap")).
- get("theField"), jParams); =
+ Map sessionMap =3D (Map)jParams.getSessionState().getAttribute("jahia_=
session_engineMap");
+ PagesFilter pagesFilter =3D null;
+ if (sessionMap !=3D null) {
+ pagesFilter =3D JahiaSiteMapService.getCurrentPagesFilter((JahiaFiel=
d)(sessionMap).
+ get("theField"), jParams);
+ } =
%>
<table border=3D"0" cellspacing=3D"0" cellpadding=3D"0" width=3D"90%">
<tr align=3D"center">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
