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

[Dominique Pillot]

dpillot     2005/11/15 13:38:40 CET

  Modified files:
    core/src/java/org/jahia/data/beans ContainerBean.java 
  Log:
  picker url fix
  
  Revision  Changes    Path
  1.20      +18 -4     
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.19&r2=1.20&f=h
  
  
  
  Index: ContainerBean.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/data/beans/ContainerBean.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ContainerBean.java        14 Nov 2005 16:42:14 -0000      1.19
  +++ ContainerBean.java        15 Nov 2005 12:38:39 -0000      1.20
  @@ -22,6 +22,9 @@
   import org.jahia.services.lock.LockService;
   import org.jahia.services.usermanager.JahiaUser;
   import org.jahia.services.workflow.WorkflowService;
  +import org.jahia.services.version.EntryLoadRequest;
  +import org.jahia.services.fields.ContentField;
  +import org.jahia.services.fields.ContentPageField;
   import org.jahia.utils.InsertionSortedMap;
   import org.jahia.bin.Jahia;
   
  @@ -34,7 +37,7 @@
    * <p>Copyright: Copyright (c) 2002</p>
    * <p>Company: Jahia Ltd</p>
    * @author Serge Huber, Xavier Lawrence
  - * @version $Id: ContainerBean.java,v 1.19 2005/11/14 16:42:14 dpillot Exp $
  + * @version $Id: ContainerBean.java,v 1.20 2005/11/15 12:38:39 dpillot Exp $
    */
   
   public class ContainerBean extends ContentBean implements 
PropertiesInterface {
  @@ -484,14 +487,22 @@
   
               ContentObject pickedObject;// the source of the linked copy(the 
picked)
               ContentContainer pickedContainer;
  -            String pickedID="";
  +            //String pickedID="";
               String pickedpageID="";
               try {
   
                   pickedObject = theContainer.getPickedObject();
                   
pickedContainer=ContentContainer.getContainer(pickedObject.getID());
  -                pickedID = "" + pickedObject.getID();
  -                pickedpageID=""+((ContentContainer)pickedObject).getPageID();
  +                //pickedID = "" + pickedObject.getID();
  +                pickedpageID=""+pickedContainer.getPageID();
  +                List l=(pickedContainer.getChilds(null, 
EntryLoadRequest.STAGED,null));
  +                for (Iterator iterator1 = l.iterator(); 
iterator1.hasNext();) {
  +                    Object o=iterator1.next();
  +                    if(!(o instanceof ContentPageField)) continue;
  +                    pickedpageID=""+((ContentPageField) 
o).getPage(processingContext, processingContext.getEntryLoadRequest()).getID();
  +                    logger.debug("found contentpagefield:"+pickedpageID);
  +                    break;
  +                }
                   curURL="document.location='"
                           + Jahia.getContextPath()
                           + Jahia.getServletPath()
  @@ -548,6 +559,9 @@
   }
       /**
        * $Log: ContainerBean.java,v $
  +     * Revision 1.20  2005/11/15 12:38:39  dpillot
  +     * picker url fix
  +     *
        * Revision 1.19  2005/11/14 16:42:14  dpillot
        * picker action name fix
        *