cmailleux 2005/12/07 15:17:08 CET
Modified files:
core/src/java/org/jahia/workflow/nstep NStepWorkflow.java
Log:
Change the order of the actions
Revision Changes Path
1.14 +5 -2
jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java.diff?r1=1.13&r2=1.14&f=h
Index: NStepWorkflow.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- NStepWorkflow.java 30 Nov 2005 15:04:42 -0000 1.13
+++ NStepWorkflow.java 7 Dec 2005 14:17:08 -0000 1.14
@@ -44,10 +44,13 @@
* Time: 14:53:40
*
* @author [EMAIL PROTECTED]
- * @version $Id: NStepWorkflow.java,v 1.13 2005/11/30 15:04:42 cmailleux Exp
$
+ * @version $Id: NStepWorkflow.java,v 1.14 2005/12/07 14:17:08 cmailleux Exp
$
* <p/>
* Revision log :
* $Log: NStepWorkflow.java,v $
+ * Revision 1.14 2005/12/07 14:17:08 cmailleux
+ * Change the order of the actions
+ *
* Revision 1.13 2005/11/30 15:04:42 cmailleux
* no message
*
@@ -319,6 +322,7 @@
JahiaGroup group =
workflowService.getRoleGroup(ContentPage.getContentObjectInstance(ContentPageKey.getInstance(objectKey)),
trimActionName(workflowStep.getName()), true);
if (group.isMember(jParams.getUser())) {
+ list.add(trimActionName(workflowStep.getName()));
// avoid rollback on first two step
if (startIndex > 2) {
// Add rollback to previous step only if we have already
done step one
@@ -328,7 +332,6 @@
// Add rollback to author (reinit workflow)
list.add(trimActionName(rollback_author_action_name));
}
- list.add(trimActionName(workflowStep.getName()));
}
} catch (JahiaException e) {
log.warn("Error during eval of available actions", e);
