cmailleux 2005/12/07 16:42:23 CET
Modified files:
core/src/java/org/jahia/hibernate/manager
JahiaFieldsDataManager.java
core/src/java/org/jahia/services/importexport
ImportExportBaseService.java
Log:
Correctly loadValue when versionned
COrrectly handle deleted stuff
Revision Changes Path
1.24 +1 -1
jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java.diff?r1=1.23&r2=1.24&f=h
1.57 +3 -9
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.56&r2=1.57&f=h
Index: JahiaFieldsDataManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JahiaFieldsDataManager.java 6 Dec 2005 12:11:16 -0000 1.23
+++ JahiaFieldsDataManager.java 7 Dec 2005 15:42:22 -0000 1.24
@@ -608,7 +608,7 @@
if (workflowState > EntryLoadRequest.ACTIVE_WORKFLOW_STATE) {
return dao.loadStagingValue(new
Integer(contentField.getID()), new Long(entryState.getVersionID()),
entryState.getLanguageCode());
- } else if (workflowState ==
EntryLoadRequest.VERSIONED_WORKFLOW_STATE) {
+ } else if (workflowState <=
EntryLoadRequest.VERSIONED_WORKFLOW_STATE) {
return dao.loadVersionedValue(new
Integer(contentField.getID()), new Long(entryState.getVersionID()),
entryState.getLanguageCode());
} else {
Index: ImportExportBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ImportExportBaseService.java 6 Dec 2005 10:57:08 -0000 1.56
+++ ImportExportBaseService.java 7 Dec 2005 15:42:23 -0000 1.57
@@ -604,8 +604,8 @@
ContentObjectEntryState toEntryState = getEntryState(object,
languageCode, toLoadRequest);
if (toEntryState != null) {
- if (toEntryState.getVersionID ()
- ==
ContentObjectEntryState.WORKFLOW_STATE_VERSIONING_DELETED) {
+ if (toEntryState.getVersionID () ==
ContentObjectEntryState.WORKFLOW_STATE_VERSIONING_DELETED ||
+ toEntryState.getWorkflowState() ==
ContentObjectEntryState.WORKFLOW_STATE_VERSIONING_DELETED) {
if(fromEntryState!=null &&
!fromEntryState.equals(toEntryState))
status = VersioningDifferenceStatus.TO_BE_REMOVED;
} else {
@@ -631,13 +631,7 @@
entryState =
ContentObjectEntryState.getEntryState (vID,
languageCode);
- entryState = object.getEntryState (entryState, false, true);
- vID = object.getDeleteVersionID();
- if ((entryState != null) && (vID > -1 ||
entryState.getWorkflowState()==ContentObjectEntryState.WORKFLOW_STATE_VERSIONING_DELETED))
{
- entryState = new
ContentObjectEntryState(ContentObjectEntryState.WORKFLOW_STATE_VERSIONING_DELETED,
-
ContentObjectEntryState.WORKFLOW_STATE_VERSIONING_DELETED,
- languageCode);
- }
+ entryState = object.getEntryState (entryState, true, true);
return entryState;
}
