Update of
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
In directory
james.mmbase.org:/tmp/cvs-serv26060/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
Modified Files:
WorkflowStatusInfo.java
Log Message:
CMSC-1228 Assets: new content types that extends articles do not show up in the
Workflow window
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1228
Index: WorkflowStatusInfo.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow/WorkflowStatusInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WorkflowStatusInfo.java 18 Nov 2008 01:38:16 -0000 1.4
+++ WorkflowStatusInfo.java 10 Jan 2009 12:57:00 -0000 1.5
@@ -21,6 +21,7 @@
private int allcontentApproved;
private int allcontentPublished;
+ private int contentDraft;
private int contentFinished;
private int contentApproved;
private int contentPublished;
@@ -85,47 +86,47 @@
int count = node.getIntValue("number");
if ("content".equals(type)) {
if (Workflow.STATUS_DRAFT.equals(status)){
- /*contentDraft = count;*/
+ contentDraft += count;
setNodetypeDraft(nodetype, count);
}
if (Workflow.STATUS_FINISHED.equals(status)){
- /*contentFinished += count;*/
+ contentFinished += count;
setNodetypeFinished(nodetype, count);
}
if (Workflow.STATUS_APPROVED.equals(status)) {
- /*if (Workflow.isAcceptedStepEnabled()) {
- contentApproved = count;
+ if (Workflow.isAcceptedStepEnabled()) {
+ contentApproved += count;
}
else {
contentFinished += count;
- }*/
+ }
setNodetypeApproved(nodetype, count);
}
if (Workflow.STATUS_PUBLISHED.equals(status)){
- /*contentPublished = count;*/
+ contentPublished += count;
setNodetypePublished(nodetype, count);
}
}
if ("asset".equals(type)) {
if (Workflow.STATUS_DRAFT.equals(status)){
- /*assetDraft = count;*/
+ assetDraft += count;
setNodetypeDraft(nodetype, count);
}
if (Workflow.STATUS_FINISHED.equals(status)){
- /*assetFinished += count;*/
+ assetFinished += count;
setNodetypeFinished(nodetype, count);
}
if (Workflow.STATUS_APPROVED.equals(status)) {
- /*if (Workflow.isAcceptedStepEnabled()) {
- assetApproved = count;
+ if (Workflow.isAcceptedStepEnabled()) {
+ assetApproved += count;
}
else {
assetFinished += count;
- }*/
+ }
setNodetypeApproved(nodetype, count);
}
if (Workflow.STATUS_PUBLISHED.equals(status)){
- /*assetPublished = count;*/
+ assetPublished = count;
setNodetypePublished(nodetype, count);
}
}
@@ -164,14 +165,6 @@
pagePublished = count;
}
}
- contentDraft = contentArticleDraft + contentBannersDraft +
contentLinkDraft + contentFaqitemDraft;
- contentFinished = contentArticleFinished + contentBannersFinished +
contentLinkFinished + contentFaqitemFinished;
- contentApproved = contentArticleApproved + contentBannersApproved +
contentLinkApproved + contentFaqitemApproved;
- contentPublished = contentArticlePublished + contentBannersPublished +
contentLinkPublished + contentFaqitemPublished;
- assetDraft = assetImagesDraft + assetAttachmentsDraft + assetUrlsDraft;
- assetFinished = assetImagesFinished + assetAttachmentsFinished +
assetUrlsFinished;
- assetApproved = assetImagesApproved + assetAttachmentsApproved +
assetUrlsApproved;
- assetPublished = assetImagesPublished + assetAttachmentsPublished +
assetUrlsPublished;
allcontentDraft = contentDraft + assetDraft;
allcontentFinished = contentFinished + assetFinished;
allcontentApproved = contentApproved + assetApproved;
@@ -691,7 +684,7 @@
public void setAssetUrlsPublished(int assetUrlsPublished) {
this.assetUrlsPublished = assetUrlsPublished;
}
- private int contentDraft;
+
public int getAllcontentDraft() {
return allcontentDraft;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
