Author: dpillot
Date: Thu Jul 12 17:22:05 2007
New Revision: 744
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D744&repname=
=3Dcorporate_portal_templates_v2
Log:
TEMPLATES-77: added a check on effective existent child pages
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/javascript/transmenu.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/javascript/transmenu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/javascript/transmenu.inc&rev=3D744&repname=3Dcorporate_port=
al_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/javascript/transmenu.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/javascript/transmenu.inc Thu Jul 1=
2 17:22:05 2007
@@ -43,11 +43,11 @@
if(!jData.gui().isEditMode()) {
topNavigationContainers =3D topNavigationContainerVector.elements(=
);
while (topNavigationContainers.hasMoreElements()) {
- JahiaContainer topNavigationContainer =3D
- (JahiaContainer) topNavigationContainers.nextElement();
- JahiaPage navigationLink =3D
- (JahiaPage) topNavigationContainer.getFieldObject("navigat=
ionLink");
- if (navigationLink !=3D null) {
+ JahiaContainer topNavigationContainer =3D (JahiaContainer) top=
NavigationContainers.nextElement();
+ JahiaPage navigationLink =3D (JahiaPage) topNavigationContaine=
r.getFieldObject("navigationLink");
+ if (navigationLink !=3D null
+ && navigationLink.getChilds(user)!=3Dnull
+ && navigationLink.getChilds(user).hasMoreElements()) {
%>
var topmenu_<%=3DtopNavigationContainer.getID()%> =3D ms.a=
ddMenu(document.getElementById("topmenu_<%=3DtopNavigationContainer.getID()=
%>"));
<%
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
