tdraier 2005/10/20 15:04:41 CEST
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
fixed scope attribute
Revision Changes Path
1.41 +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.40&r2=1.41&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ManageContentPicker.java 19 Oct 2005 14:24:53 -0000 1.40
+++ ManageContentPicker.java 20 Oct 2005 13:04:40 -0000 1.41
@@ -34,7 +34,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.40 2005/10/19 14:24:53 dpillot
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.41 2005/10/20 13:04:40 tdraier
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -394,7 +394,7 @@
//domain scope
String scope = (String) processingContext.getParameter("searchSite");
if (scope == null && siteService.getNbSites() > 1) scope = "all";
//default
- else if (siteService.getNbSites() == 1) scope = "" +
siteService.getSite(((JahiaSite) siteService.getSites().nextElement()).getID());
+ else if (siteService.getNbSites() == 1) scope = "" + ((JahiaSite)
siteService.getSites().nextElement()).getID();
// transform main query(only if not empty)
searchString=searchString.trim();
@@ -784,6 +784,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.41 2005/10/20 13:04:40 tdraier
+ * fixed scope attribute
+ *
* Revision 1.40 2005/10/19 14:24:53 dpillot
* content pick final enhancements
*
