cmailleux 2005/12/12 12:48:19 CET
Modified files:
core/src/java/org/jahia/engines/lock LockEngine.java
core/src/java/org/jahia/services/lock LockRegistry.java
core/src/java/org/jahia/workflow/nstep NStepWorkflow.java
core/src/webapp/jsp/jahia/engines/workflow adv_workflow.jsp
Log:
Only Member of admin group can steal workflow lock
Root is allowed to make all step of an NStep Workflow
Correctly close lock engine when clicking cancel
Revision Changes Path
1.13 +1 -0
jahia/core/src/java/org/jahia/engines/lock/LockEngine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/lock/LockEngine.java.diff?r1=1.12&r2=1.13&f=h
1.8 +1 -1
jahia/core/src/java/org/jahia/services/lock/LockRegistry.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/lock/LockRegistry.java.diff?r1=1.7&r2=1.8&f=h
1.15 +6 -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.14&r2=1.15&f=h
1.16 +0 -0
jahia/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp.diff?r1=1.15&r2=1.16&f=h
Index: LockEngine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/lock/LockEngine.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LockEngine.java 12 Dec 2005 11:18:39 -0000 1.12
+++ LockEngine.java 12 Dec 2005 11:48:18 -0000 1.13
@@ -231,6 +231,7 @@
toolBox.displayScreen (jParams, engineMap);
}else if (actionScreen.equals ("cancel")) {
engineMap.put ("jspSource", "close");
+ engineMap.put (RENDER_TYPE_PARAM, new Integer
(JahiaEngine.RENDERTYPE_FORWARD));
toolBox.displayScreen (jParams, engineMap);
}
}
Index: LockRegistry.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/lock/LockRegistry.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LockRegistry.java 27 Sep 2005 10:58:43 -0000 1.7
+++ LockRegistry.java 12 Dec 2005 11:48:18 -0000 1.8
@@ -352,7 +352,7 @@
JahiaUser owner) {
ObjectKey objectKey = lockKey.getObjectKey();
// Try to get the content object from lock key if exists...
- if (objectKey != null) {
+ if (objectKey != null &&
!LockKey.WORKFLOW_TYPE.equals(lockKey.getType())) {
try {
ContentObject contentObject = (ContentObject) JahiaObject.
getInstance(objectKey);
Index: NStepWorkflow.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- NStepWorkflow.java 7 Dec 2005 14:17:08 -0000 1.14
+++ NStepWorkflow.java 12 Dec 2005 11:48:18 -0000 1.15
@@ -44,10 +44,17 @@
* Time: 14:53:40
*
* @author [EMAIL PROTECTED]
- * @version $Id: NStepWorkflow.java,v 1.14 2005/12/07 14:17:08 cmailleux Exp
$
+ * @version $Id: NStepWorkflow.java,v 1.15 2005/12/12 11:48:18 cmailleux Exp
$
* <p/>
* Revision log :
* $Log: NStepWorkflow.java,v $
+ * Revision 1.15 2005/12/12 11:48:18 cmailleux
+ * Only Member of admin group can steal workflow lock
+ *
+ * Root is allowed to make all step of an NStep Workflow
+ *
+ * Correctly close lock engine when clicking cancel
+ *
* Revision 1.14 2005/12/07 14:17:08 cmailleux
* Change the order of the actions
*
@@ -321,7 +328,8 @@
try {
JahiaGroup group =
workflowService.getRoleGroup(ContentPage.getContentObjectInstance(ContentPageKey.getInstance(objectKey)),
trimActionName(workflowStep.getName()), true);
- if (group.isMember(jParams.getUser())) {
+ JahiaUser user = jParams.getUser();
+ if (group.isMember(user) || user.isRoot()) {
list.add(trimActionName(workflowStep.getName()));
// avoid rollback on first two step
if (startIndex > 2) {
