pvollenweider 2004/09/30 15:40:33 CEST
Modified files:
src/view/jsp/include sitemap.inc
Log:
- Bug fix on sitemap. Remove the link to a page marked for deletion.
Revision Changes Path
1.8 +11 -4 corporate_portal_templates/src/view/jsp/include/sitemap.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/sitemap.inc.diff?r1=1.7&r2=1.8&f=h
Index: sitemap.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/sitemap.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sitemap.inc 24 Aug 2004 17:41:20 -0000 1.7
+++ sitemap.inc 30 Sep 2004 13:40:32 -0000 1.8
@@ -102,10 +102,10 @@
if (contentPage == null) {
continue;
}
-
+
// now we test if the page has moved and if we are in normal mode.
if (jData.gui().isNormalMode()) {
- if ((contentPage.hasSameParentID() != ContentPage.SAME_PARENT) &&
+ if ((contentPage.hasSameParentID() != ContentPage.SAME_PARENT) &&
(contentPage.hasSameParentID() != treeJahiaSiteMap.getParentPageID(i)))
{
continue;
}
@@ -206,13 +206,20 @@
jParams.getUser());
%>
<td align="center">
- <a href='<%= !authorizedPage ? alertNotReachablePage :
contentPage.getURL(jParams, languageCode)%>'><%
+ <%
+ if (! isPageMarkedForDeletion) {
+ %><a href='<%= !authorizedPage ?
alertNotReachablePage : contentPage.getURL(jParams, languageCode)%>'><%
+ }
if (jData.gui().isPreviewMode()) {
%><jahia:displayIcon src="vuIcon" alt="Page exists
in this language" align="absmiddle" /><%
} else {
%><jahia:displayIcon
src="<%=resourceBundleState[languageState.intValue()]%>"
alt="<%=workflowState[languageState.intValue()]%>"/><%
- } %></a>
+ }
+ if (! isPageMarkedForDeletion) {
+ %></a><%
+ }
+ %>
</td>
<%
}
