Author: rfelden
Date: Fri Dec 21 15:44:24 2007
New Revision: 19402
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19402&repname=
=3Djahia
Log:
MEY-42 : npe fix (select home page with pages filter)
Modified:
branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/selectpage/select=
_page.jsp
Modified: branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/selectpage/=
select_page.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/views/jsp/jahia/engines/selectpage/select_page.jsp&rev=3D19402&rep=
name=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-4-1-BRANCH/src/views/jsp/jahia/engines/selectpage/select=
_page.jsp (original)
+++ branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/selectpage/select=
_page.jsp Fri Dec 21 15:44:24 2007
@@ -158,9 +158,12 @@
<% } %>
<table class=3D"text" border=3D"0" cellspacing=3D"0" cellpadding=3D"1" wid=
th=3D"90%" align=3D"center">
<%
-final PagesFilter pagesFilter =3D JahiaSiteMapService.getCurrentPagesFilte=
r(
- (JahiaField)((Map)jParams.getSession().getAttribute("jahia_session=
_engineMap")).
- get("theField"), jParams); =
+Map sessionMap =3D (Map)jParams.getSession().getAttribute("jahia_session_e=
ngineMap") ;
+ PagesFilter pagesFilter =3D null ;
+ if (sessionMap !=3D null) {
+ pagesFilter =3D JahiaSiteMapService.getCurrentPagesFilter(
+ (JahiaField)sessionMap.get("theField"), jParams); =
+ }
if (activeTabOption.intValue() =3D=3D SiteMapViewHelper.TREE_VIEW) {
%>
<tr>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
