cvs commit: jahia/core/src/java/org/jahia/data/beans ContainerBean.java

[Thomas Draier]

tdraier     2005/11/22 16:57:40 CET

  Modified files:
    core/src/java/org/jahia/data/beans ContainerBean.java 
  Log:
  also check parents
  
  Revision  Changes    Path
  1.24      +14 -3     
jahia/core/src/java/org/jahia/data/beans/ContainerBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/beans/ContainerBean.java.diff?r1=1.23&r2=1.24&f=h
  
  
  
  Index: ContainerBean.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/data/beans/ContainerBean.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ContainerBean.java        21 Nov 2005 15:25:31 -0000      1.23
  +++ ContainerBean.java        22 Nov 2005 15:57:40 -0000      1.24
  @@ -26,6 +26,7 @@
   import org.jahia.services.fields.ContentField;
   import org.jahia.services.fields.ContentPageField;
   import org.jahia.services.pages.JahiaPage;
  +import org.jahia.services.pages.ContentPage;
   import org.jahia.utils.InsertionSortedMap;
   import org.jahia.bin.Jahia;
   
  @@ -38,7 +39,7 @@
    * <p>Copyright: Copyright (c) 2002</p>
    * <p>Company: Jahia Ltd</p>
    * @author Serge Huber, Xavier Lawrence
  - * @version $Id: ContainerBean.java,v 1.23 2005/11/21 15:25:31 dpillot Exp $
  + * @version $Id: ContainerBean.java,v 1.24 2005/11/22 15:57:40 tdraier Exp $
    */
   
   public class ContainerBean extends ContentBean implements 
PropertiesInterface {
  @@ -572,8 +573,15 @@
                           logger.debug("NumberFormatException", nfe);
                       }
                       if (pageID > 0) {
  -                        if (pageID == processingContext.getPageID()) {
  -                            return true;
  +                        try {
  +                            ContentObject cp = 
ContentPage.getPage(processingContext.getPageID());
  +                            while (cp != null) {
  +                                if (cp instanceof ContentPage && cp.getID() 
== pageID) {
  +                                    return true;
  +                                }
  +                                cp = cp.getParent(null, 
EntryLoadRequest.STAGED, null);
  +                            }
  +                        } catch (JahiaException e) {
                           }
                       }
                   }
  @@ -585,6 +593,9 @@
   }
       /**
        * $Log: ContainerBean.java,v $
  +     * Revision 1.24  2005/11/22 15:57:40  tdraier
  +     * also check parents
  +     *
        * Revision 1.23  2005/11/21 15:25:31  dpillot
        * fix npe jira 535
        *