cvs commit: jahia/core/src/java/org/jahia/engines/importexport ManageContentPicker.java

[Thomas Draier]

tdraier     2005/11/22 16:30:28 CET

  Modified files:
    core/src/java/org/jahia/engines/importexport 
                                                 ManageContentPicker.java 
  Log:
  filter validated results, remove parents
  
  Revision  Changes    Path
  1.51      +7 -4      
jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java.diff?r1=1.50&r2=1.51&f=h
  
  
  
  Index: ManageContentPicker.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- ManageContentPicker.java  14 Nov 2005 16:06:12 -0000      1.50
  +++ ManageContentPicker.java  22 Nov 2005 15:30:28 -0000      1.51
  @@ -41,7 +41,7 @@
    *
    * @author Thomas Draier, joe Pillot
    * @author ${User}
  - * @version $Id: ManageContentPicker.java,v 1.50 2005/11/14 16:06:12 tdraier 
Exp $
  + * @version $Id: ManageContentPicker.java,v 1.51 2005/11/22 15:30:28 tdraier 
Exp $
    */
   public class ManageContentPicker {
       private static org.apache.log4j.Logger logger =
  @@ -568,10 +568,9 @@
                                   if 
(dest.getObjectKey().equals(current.getObjectKey())) {
                                       break;
                                   }
  -                                // validated content
  -                                dest = 
dest.getParent(EntryLoadRequest.CURRENT);
  +                                dest = dest.getParent(null);
                               }
  -                            if (dest == null) {
  +                            if (dest == null && current.hasActiveEntries()) {
                                   String key = 
Integer.toString(current.getID());
                                   int pageID = contentContainer.getPageID();
                                   //used to try to create an url
  @@ -850,6 +849,9 @@
   }
   /**
    * $Log: ManageContentPicker.java,v $
  + * Revision 1.51  2005/11/22 15:30:28  tdraier
  + * filter validated results, remove parents
  + *
    * Revision 1.50  2005/11/14 16:06:12  tdraier
    * added workflow job
    * fixed acl import/export, try to map on local users/groups