tdraier 2005/11/18 16:00:33 CET
Modified files:
core/src/java/org/jahia/engines/addcontainer
AddContainer_Engine.java
core/src/java/org/jahia/services/fields
JahiaFieldBaseService.java
core/src/java/org/jahia/services/importexport
ImportExportBaseService.java
ImportHandler.java
Log:
multi lang import/export fix
Revision Changes Path
1.38 +3 -3
jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java.diff?r1=1.37&r2=1.38&f=h
1.25 +3 -3
jahia/core/src/java/org/jahia/services/fields/JahiaFieldBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/fields/JahiaFieldBaseService.java.diff?r1=1.24&r2=1.25&f=h
1.45 +11 -4
jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java.diff?r1=1.44&r2=1.45&f=h
1.48 +1 -1
jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java.diff?r1=1.47&r2=1.48&f=h
Index: AddContainer_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- AddContainer_Engine.java 18 Nov 2005 13:41:21 -0000 1.37
+++ AddContainer_Engine.java 18 Nov 2005 15:00:32 -0000 1.38
@@ -736,7 +736,7 @@
jParams.getSessionState().setAttribute("AddContainer", "false");
}
return null;
-
+
} // end processCurrentScreen
private JahiaContainerList ensureContainerList(JahiaContainer
theContainer, HashMap engineMap, ProcessingContext jParams) throws
JahiaException {
@@ -744,8 +744,8 @@
getJahiaContainersService();
JahiaContainerList list =
jahiaContainersService.loadContainerListInfo(theContainer.getListID());
int containerParentID = ((Integer)
engineMap.get("containerParentID")).intValue();
- int id =
jahiaContainersService.getContainerListID(theContainer.getDefinition().getName(),
theContainer.getPageID(),containerParentID);
- if (id > 0) {
+ int id =
jahiaContainersService.getContainerListID(theContainer.getDefinition().getName(),
theContainer.getPageID(),containerParentID);
+ if (list == null && id > 0) {
list = jahiaContainersService.loadContainerListInfo(id);
theContainer.setListID(list.getID());
}
Index: JahiaFieldBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/fields/JahiaFieldBaseService.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JahiaFieldBaseService.java 24 Oct 2005 12:42:25 -0000 1.24
+++ JahiaFieldBaseService.java 18 Nov 2005 15:00:33 -0000 1.25
@@ -66,6 +66,7 @@
import org.jahia.services.containers.JahiaContainersService;
import org.jahia.services.files.JahiaTextFileService;
import org.jahia.services.pages.JahiaPage;
+import org.jahia.services.pages.ContentPage;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.*;
import org.jahia.services.workflow.WorkflowEvent;
@@ -904,9 +905,8 @@
int pageDefID = 0;
if ( theField.getDefinition().getJahiaID() != 0 ){
- JahiaPage jahiaPage =
ServicesRegistry.getInstance().getJahiaPageService().lookupPage(theField.getPageID(),
-
jParams);
- pageDefID = jahiaPage.getPageTemplateID();
+ ContentPage jahiaPage =
ContentPage.getPage(theField.getPageID());
+ pageDefID = jahiaPage.getPageTemplateID(jParams);
}
String errorMsg = "";
Index: ImportExportBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ImportExportBaseService.java 16 Nov 2005 11:23:32 -0000 1.44
+++ ImportExportBaseService.java 18 Nov 2005 15:00:33 -0000 1.45
@@ -244,7 +244,7 @@
view = false;
break;
}
- } else if (entryState == null) {
+ } else if (!(object instanceof ContentPage) && entryState ==
null) {
return;
}
@@ -254,26 +254,33 @@
elementName = "page";
ContentPage cp = ((ContentPage)object);
+ String title = cp.getTitle(toLoadRequest, false);
switch (cp.getPageType(toLoadRequest)) {
case JahiaPage.TYPE_DIRECT:
attr.addAttribute(JCR_URI, "uuid", "jcr:uuid",
"CDATA", getUuid(cp));
if (view) {
attr.addAttribute(JAHIA_URI, "template",
"jahia:template", "CDATA",
((ContentPage)object).getPageTemplate(toLoadRequest).getName());
- attr.addAttribute(JAHIA_URI, "title",
"jahia:title", "CDATA", ((ContentPage)object).getTitle(toLoadRequest, false));
+ if (title != null) {
+ attr.addAttribute(JAHIA_URI, "title",
"jahia:title", "CDATA", title);
+ }
}
break;
case JahiaPage.TYPE_LINK:
elementName = "link";
attr.addAttribute(JAHIA_URI, "reference",
"jahia:reference", "CDATA",
getUuid(ContentPage.getPage(cp.getPageLinkID(toLoadRequest))));
if (view) {
- attr.addAttribute(JAHIA_URI, "title",
"jahia:title", "CDATA", cp.getTitle(toLoadRequest));
+ if (title != null) {
+ attr.addAttribute(JAHIA_URI, "title",
"jahia:title", "CDATA", title);
+ }
}
break;
case JahiaPage.TYPE_URL:
elementName = "url";
if (view) {
attr.addAttribute(JAHIA_URI, "value",
"jahia:value", "CDATA", cp.getURL(jParams, language));
- attr.addAttribute(JAHIA_URI, "title",
"jahia:title", "CDATA", cp.getTitle(toLoadRequest));
+ if (title != null) {
+ attr.addAttribute(JAHIA_URI, "title",
"jahia:title", "CDATA", title);
+ }
}
attr.addAttribute(JCR_URI, "uuid", "jcr:uuid",
"CDATA", getUuid(object));
break;
Index: ImportHandler.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ImportHandler.java 17 Nov 2005 13:03:33 -0000 1.47
+++ ImportHandler.java 18 Nov 2005 15:00:33 -0000 1.48
@@ -692,7 +692,7 @@
}
// Field Definition
String value =
atts.getValue(ImportExportBaseService.JAHIA_URI, "value");
- int fieldType =
jfd.getType(ServicesRegistry.getInstance().getJahiaPageService().lookupPage(pageID,
jParams).getPageTemplateID());
+ int fieldType =
jfd.getType(ContentPage.getPage(pageID).getPageTemplate(elr).getID());
if (fieldType == FieldTypes.PAGE) {
value = "";
}
