dpillot 2005/09/30 18:59:21 CEST
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
bug fix
Revision Changes Path
1.24 +12 -14
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.23&r2=1.24&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ManageContentPicker.java 29 Sep 2005 16:32:45 -0000 1.23
+++ ManageContentPicker.java 30 Sep 2005 16:59:21 -0000 1.24
@@ -2,15 +2,12 @@
import org.jahia.content.ContainerDefinitionKey;
import org.jahia.content.ContentObject;
-import org.jahia.content.ContentObjectKey;
import org.jahia.content.JahiaObject;
-import org.jahia.data.JahiaData;
import org.jahia.data.containers.JahiaContainerDefinition;
import org.jahia.data.search.JahiaContainerSearchHit;
import org.jahia.data.search.JahiaSearchHit;
import org.jahia.data.search.JahiaSearchResult;
import org.jahia.engines.JahiaEngine;
-import org.jahia.engines.search.SearchViewHandlerImpl;
import org.jahia.engines.search.Search_Engine;
import org.jahia.exceptions.JahiaException;
import org.jahia.exceptions.JahiaSessionExpirationException;
@@ -19,17 +16,13 @@
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.containers.ContentContainer;
import org.jahia.services.containers.ContentContainerList;
+import org.jahia.services.fields.ContentField;
+import org.jahia.services.fields.ContentPageField;
+import org.jahia.services.fields.ContentSmallTextField;
import org.jahia.services.importexport.ImportExportService;
-import org.jahia.services.importexport.ImportHandler;
import org.jahia.services.search.*;
-import org.jahia.services.sites.SiteLanguageSettings;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.version.EntryLoadRequest;
-import org.jahia.services.fields.ContentField;
-import org.jahia.services.fields.ContentSmallTextField;
-import org.jahia.services.fields.ContentPageField;
-import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.services.metadata.MetadataService;
import org.jahia.utils.JahiaTools;
import java.util.*;
@@ -41,7 +34,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.23 2005/09/29 16:32:45 dpillot
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.24 2005/09/30 16:59:21 dpillot
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -99,7 +92,7 @@
//JahiaUser user = processingContext.getUser ();
logger.debug("loading mode");
engineMap.put("fieldsEditCallingEngineName", "contentpick_engine");
-
+ engineMap.put("adminAccess", Boolean.TRUE);
//check if we just need a sort on previous results
String o = processingContext.getParameter("orderby");
//o not null nor empty,lasto exist, o!=lasto, results not null
@@ -140,10 +133,12 @@
private boolean save(ProcessingContext jParams, HashMap engineMap,
ContentObject object)
throws JahiaException {
+ String op = jParams.getParameter("contentPickOp");
logger.debug("saving mode");
+ if(op!=null) logger.debug("pickoperation:");
try {
- String op = jParams.getParameter("contentPickOp");
- if (op != null) {
+
+ if (op != null && !op.equalsIgnoreCase("")) {
String copytype = op.substring(0, op.indexOf('_'));
String sourceId = op.substring(op.indexOf('_') + 1);
ContentObject source =
ContentContainer.getContainer(Integer.parseInt(sourceId));
@@ -430,6 +425,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.24 2005/09/30 16:59:21 dpillot
+ * bug fix
+ *
* Revision 1.23 2005/09/29 16:32:45 dpillot
* fix on jsp called
*
