Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
In directory
james.mmbase.org:/tmp/cvs-serv2393/workflow/src/java/com/finalist/cmsc/workflow
Modified Files:
PageWorkflow.java ContentWorkflow.java LinkWorkflow.java
AssetWorkflow.java WorkflowManager.java
Log Message:
CMSC-1087 changes the status box of a page to a dynamic tree in the Workflow
section of the CMSc
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1087
Index: PageWorkflow.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- PageWorkflow.java 8 Aug 2008 13:44:01 -0000 1.10
+++ PageWorkflow.java 11 Nov 2008 08:03:22 -0000 1.11
@@ -56,7 +56,7 @@
return (Node) getWorkflows(page).get(0);
}
else {
- Node wfItem = createFor(TYPE_PAGE, remark);
+ Node wfItem = createFor(TYPE_PAGE, remark, null);
RelationUtil.createRelation(wfItem, page, WORKFLOWREL);
log.debug("Workflow " + wfItem.getNumber() + " created for page "
+ page.getNumber());
return wfItem;
Index: ContentWorkflow.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/ContentWorkflow.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ContentWorkflow.java 8 Aug 2008 13:44:01 -0000 1.9
+++ ContentWorkflow.java 11 Nov 2008 08:03:22 -0000 1.10
@@ -43,7 +43,7 @@
return (Node) getWorkflows(content).get(0);
}
else {
- Node wfItem = createFor(TYPE_CONTENT, remark);
+ Node wfItem = createFor(TYPE_CONTENT, remark,
content.getNodeManager().getName());
RelationUtil.createRelation(wfItem, content, WORKFLOWREL);
log.debug("Workflow " + wfItem.getNumber() + " created for content
" + content.getNumber());
return wfItem;
Index: LinkWorkflow.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/LinkWorkflow.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- LinkWorkflow.java 8 Aug 2008 13:44:01 -0000 1.12
+++ LinkWorkflow.java 11 Nov 2008 08:03:22 -0000 1.13
@@ -42,7 +42,7 @@
public Node createFor(Node channel, String remark) {
Node wfItem = getWorkflowNode(channel, TYPE_LINK);
if (wfItem == null) {
- wfItem = createFor(TYPE_LINK, remark, Workflow.STATUS_FINISHED);
+ wfItem = createFor(TYPE_LINK, remark, Workflow.STATUS_FINISHED, null);
}
if (channel != null) {
Index: AssetWorkflow.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/AssetWorkflow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AssetWorkflow.java 10 Nov 2008 05:48:01 -0000 1.1
+++ AssetWorkflow.java 11 Nov 2008 08:03:22 -0000 1.2
@@ -43,7 +43,7 @@
return (Node) getWorkflows(asset).get(0);
}
else {
- Node wfItem = createFor(TYPE_ASSET, remark);
+ Node wfItem = createFor(TYPE_ASSET, remark,
asset.getNodeManager().getName());
RelationUtil.createRelation(wfItem, asset, WORKFLOWREL);
log.debug("Workflow " + wfItem.getNumber() + " created for asset "
+ asset.getNumber());
return wfItem;
Index: WorkflowManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/WorkflowManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- WorkflowManager.java 9 Oct 2008 12:05:56 -0000 1.17
+++ WorkflowManager.java 11 Nov 2008 08:03:22 -0000 1.18
@@ -31,6 +31,7 @@
public final static String NUMBER_FIELD = "number";
public final static String STATUS_FIELD = "status";
public final static String TYPE_FIELD = "type";
+ public final static String NODETYPE_FIELD = "nodetype";
public final static String REMARK_FIELD = "remark";
public static final String CREATIONDATE_FIELD = "creationdate";
public static final String LASTMODIFIEDDATE_FIELD = "lastmodifieddate";
@@ -291,15 +292,16 @@
}
- protected Node createFor(String type, String remark) {
- return createFor(type, remark, STATUS_DRAFT);
+ protected Node createFor(String type, String remark, String nodetype) {
+ return createFor(type, remark, STATUS_DRAFT, nodetype);
}
- protected Node createFor(String type, String remark, String status) {
+ protected Node createFor(String type, String remark, String status, String
nodetype) {
NodeManager workflow = getManager();
Node wfItem = workflow.createNode();
wfItem.setStringValue(TYPE_FIELD, type);
+ wfItem.setStringValue(NODETYPE_FIELD, nodetype);
changeWorkflow(wfItem, status, remark);
Node user = SecurityUtil.getUserNode(cloud);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
