cmailleux 2005/12/06 10:05:49 CET
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
Use scope instead of seraching again in processing context the searchSite
Revision Changes Path
1.58 +6 -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.57&r2=1.58&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ManageContentPicker.java 6 Dec 2005 08:38:02 -0000 1.57
+++ ManageContentPicker.java 6 Dec 2005 09:05:48 -0000 1.58
@@ -41,7 +41,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.57 2005/12/06 08:38:02
xlawrence Exp $
+ * @version $Id: ManageContentPicker.java,v 1.58 2005/12/06 09:05:48
cmailleux Exp $
*/
public class ManageContentPicker {
private static final org.apache.log4j.Logger logger =
@@ -581,12 +581,11 @@
// we get the languagecode from this site
//todo these could be set in user settings
- final String searchSite =
processingContext.getParameter("searchSite");
final int searchSiteID;
- if (searchSite == null || searchSite.length() == 0) {
+ if (scope == null || scope.length() == 0) {
searchSiteID = processingContext.getSiteID();
} else {
- searchSiteID = Integer.parseInt(searchSite);
+ searchSiteID = Integer.parseInt(scope);
}
site = siteService.getSite(searchSiteID);
@@ -903,6 +902,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.58 2005/12/06 09:05:48 cmailleux
+ * Use scope instead of seraching again in processing context the searchSite
+ *
* Revision 1.57 2005/12/06 08:38:02 xlawrence
* Quick fix to avoid NumberFormatException in case parameter "searchSite"
is not present
*
