shuber 2004/09/10 11:00:45 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/views/jsp/jahia/engines/selectpage select_page.jsp
Log:
Revert changes . Allow links to the current page, because it is useful when using
absolute container lists and absolute fields.
Revision Changes Path
1.24.4.3 +2 -4 jahia/src/views/jsp/jahia/engines/selectpage/select_page.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/selectpage/select_page.jsp.diff?r1=1.24.4.2&r2=1.24.4.3&f=h
Index: select_page.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/selectpage/Attic/select_page.jsp,v
retrieving revision 1.24.4.2
retrieving revision 1.24.4.3
diff -u -r1.24.4.2 -r1.24.4.3
--- select_page.jsp 9 Sep 2004 12:07:12 -0000 1.24.4.2
+++ select_page.jsp 10 Sep 2004 09:00:44 -0000 1.24.4.3
@@ -251,8 +251,7 @@
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) != parentPageID ||
+ treeJahiaSiteMap.getPageID(i) != pageID ||
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
@@ -352,8 +351,7 @@
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) != parentPageID ||
+ flatJahiaSiteMap.getPageID(i) != pageID ||
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
