dpillot 2005/11/25 12:24:55 CET
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
return valid or staging results
Revision Changes Path
1.53 +5 -2
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.52&r2=1.53&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ManageContentPicker.java 23 Nov 2005 17:33:26 -0000 1.52
+++ ManageContentPicker.java 25 Nov 2005 11:24:55 -0000 1.53
@@ -42,7 +42,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.52 2005/11/23 17:33:26 dpillot
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.53 2005/11/25 11:24:55 dpillot
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -582,7 +582,7 @@
}
dest = dest.getParent(null);
}
- if (dest == null && current.hasActiveEntries()) {
+ if (dest == null &&
current.hasActiveOrStagingEntries()) {
String key =
Integer.toString(current.getID());
int pageID = contentContainer.getPageID();
//used to try to create an url
@@ -861,6 +861,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.53 2005/11/25 11:24:55 dpillot
+ * return valid or staging results
+ *
* Revision 1.52 2005/11/23 17:33:26 dpillot
* object type info for cp display
*
