shuber 2004/09/09 14:08:56 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/selectpage select_page.jsp
Log:
Bugfix on page links : disallow links on same page.
Revision Changes Path
1.3 +4 -2
jahia/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp.diff?r1=1.2&r2=1.3&f=h
Index: select_page.jsp
===================================================================
RCS file: /cvs/jahia/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- select_page.jsp 6 Aug 2004 19:39:41 -0000 1.2
+++ select_page.jsp 9 Sep 2004 12:08:55 -0000 1.3
@@ -251,7 +251,8 @@
if ( !hasMoved && // page should not have been moved
!isPageMarkedForDeletion && // Page should not have been deleted
(SelectPage_Engine.LINK_OPERATION.equals(selectedPageOperation) &&
- treeJahiaSiteMap.getPageID(i) != pageID ||
+ treeJahiaSiteMap.getPageID(i) != pageID &&
+ treeJahiaSiteMap.getPageID(i) != parentPageID ||
SelectPage_Engine.SELECT_ANY_PAGE_OPERATION.equals(selectedPageOperation) ||
contentPage.getParentID(jParams) != parentPageID && // should not be
a sister page
!contentPage.isParentPage(jParams, parentPageID)) // should not be a
parent page
@@ -351,7 +352,8 @@
if (!hasMoved && // page should not have been moved
!isPageMarkedForDeletion && // Page should not have been deleted
(SelectPage_Engine.LINK_OPERATION.equals(selectedPageOperation) &&
- flatJahiaSiteMap.getPageID(i) != pageID ||
+ flatJahiaSiteMap.getPageID(i) != pageID &&
+ flatJahiaSiteMap.getPageID(i) != parentPageID ||
SelectPage_Engine.SELECT_ANY_PAGE_OPERATION.equals(selectedPageOperation) ||
contentPage.getParentID(jParams) != parentPageID && // should not be
a sister page
!contentPage.isParentPage(jParams, parentPageID)) // should not be a
parent page
