tdraier 2005/02/10 12:10:10 CET
Modified files:
core/src/java/org/jahia/services/workflow
WorkflowEventListener.java
Log:
removed strange test in WorkflowEventListener in no workflow mode, always
validate if something is modified. fix JAHIA-253 , and maybe 254
Revision Changes Path
1.7 +1 -9
jahia/core/src/java/org/jahia/services/workflow/WorkflowEventListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/workflow/WorkflowEventListener.java.diff?r1=1.6&r2=1.7&f=h
Index: WorkflowEventListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/workflow/WorkflowEventListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WorkflowEventListener.java 8 Dec 2004 11:28:47 -0000 1.6
+++ WorkflowEventListener.java 10 Feb 2005 11:10:10 -0000 1.7
@@ -74,15 +74,7 @@
JahiaSaveVersion saveVersion = new JahiaSaveVersion
(true, versioningActive);
StateModificationContext stateModifContext = new
StateModificationContext(mainObject.getObjectKey(), langs,
descendingInSubPages);
if (!object.getStagingLanguages(true).isEmpty()) {
- List l = object.getChilds(jParams.getUser(),
EntryLoadRequest.CURRENT, ParamBean.NORMAL);
- boolean activate = true;
- for (Iterator iterator = l.iterator();
iterator.hasNext() && activate;) {
- ContentObject o = (ContentObject)
iterator.next();
- activate &=
o.getActiveAndStagingEntryStates().isEmpty();
- }
- if (activate) {
- object.activate(langs, versioningActive,
saveVersion, user, jParams, stateModifContext);
- }
+ object.activate(langs, versioningActive,
saveVersion, user, jParams, stateModifContext);
}
break;
case WorkflowService.JAHIA_INTERNAL:
