knguyen 2005/09/23 10:51:42 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/data/containers ContainerFilterBean.java
Log:
- fix rangequery and rollback workflow state check
Revision Changes Path
1.20.4.3.2.5 +4 -6
jahia/src/java/org/jahia/data/containers/ContainerFilterBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/containers/ContainerFilterBean.java.diff?r1=1.20.4.3.2.4&r2=1.20.4.3.2.5&f=h
Index: ContainerFilterBean.java
===================================================================
RCS file:
/cvs/jahia/src/java/org/jahia/data/containers/Attic/ContainerFilterBean.java,v
retrieving revision 1.20.4.3.2.4
retrieving revision 1.20.4.3.2.5
diff -u -r1.20.4.3.2.4 -r1.20.4.3.2.5
--- ContainerFilterBean.java 13 Sep 2005 09:33:55 -0000 1.20.4.3.2.4
+++ ContainerFilterBean.java 23 Sep 2005 08:51:42 -0000 1.20.4.3.2.5
@@ -626,8 +626,6 @@
}
clauseBuff.append(")");
} else {
-
- clauseBuff.append("(");
clauseBuff.append(getMultilangAndStagingFiltering(this.entryLoadRequest));
clauseBuff.append(" AND ");
clauseBuff.append(FIELD_VALUE);
@@ -739,7 +737,7 @@
if ( this.entryLoadRequest.isCurrent() ){
bits.set(aField.ctnID);
} else if ( this.entryLoadRequest.isStaging()
- && aField.workflowState >=
EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
+ && aField.workflowState >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
bits.set(aField.ctnID);
} else if ( aField.workflowState ==
EntryLoadRequest.ACTIVE_WORKFLOW_STATE
&& !stagingFields.contains(new Integer(aField.id))){
@@ -961,7 +959,7 @@
if ( this.entryLoadRequest.isCurrent() ){
datas.put(new Integer(aField.ctnID),aField.value);
} else if ( this.entryLoadRequest.isStaging()
- && aField.workflowState >=
EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
+ && aField.workflowState >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
datas.put(new Integer(aField.ctnID),aField.value);
} else if ( aField.workflowState ==
EntryLoadRequest.ACTIVE_WORKFLOW_STATE
&& !stagingFields.contains(new Integer(aField.id))){
@@ -1450,7 +1448,7 @@
if ( this.entryLoadRequest.isCurrent() ){
bits.set(aField.ctnID);
} else if ( this.entryLoadRequest.isStaging()
- && aField.workflowState >=
EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
+ && aField.workflowState >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
bits.set(aField.ctnID);
} else if ( aField.workflowState ==
EntryLoadRequest.ACTIVE_WORKFLOW_STATE
&& !stagingFields.contains(new Integer(aField.id))){
@@ -1822,7 +1820,7 @@
if ( this.entryLoadRequest.isCurrent() ){
datas.put(new Integer(aField.ctnID),aField.value);
} else if ( this.entryLoadRequest.isStaging()
- && aField.workflowState >=
EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
+ && aField.workflowState >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
datas.put(new Integer(aField.ctnID),aField.value);
} else if ( aField.workflowState ==
EntryLoadRequest.ACTIVE_WORKFLOW_STATE
&& !stagingFields.contains(new Integer(aField.id))){
