Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
In directory
james.mmbase.org:/tmp/cvs-serv5803/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
Modified Files:
WizardWorkflowController.java
Log Message:
CMSC-970 A content element does not add a workflow item to the 2nd user who
edits a element
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
See also: http://www.mmbase.org/jira/browse/CMSC-970
Index: WizardWorkflowController.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- WizardWorkflowController.java 21 Jun 2008 12:34:24 -0000 1.7
+++ WizardWorkflowController.java 8 Aug 2008 13:43:53 -0000 1.8
@@ -136,15 +136,25 @@
if (wizardConfig.wiz.committed()) {
if (NEW_OBJECT.equals(objectnr)) {
- if (wizardConfig.wiz.committed() &&
!Workflow.hasWorkflow(editNode)) {
+ if (wizardConfig.wiz.committed()) {
+ if (!Workflow.hasWorkflow(editNode)) {
Workflow.create(editNode, workflowcomment);
}
+ else {
+ Workflow.addUserToWorkflow(editNode);
+ }
+ }
}
else {
- if (!Workflow.hasWorkflow(editNode) &&
!CANCEL.equals(workflowCommand)) {
+ if (!CANCEL.equals(workflowCommand)) {
+ if (!Workflow.hasWorkflow(editNode)) {
log.debug("object " + objectnr + " missing workflow.
creating one. ");
Workflow.create(editNode, "");
}
+ else {
+ Workflow.addUserToWorkflow(editNode);
+ }
+ }
}
// wizard command is commit
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
