Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms
In directory
james.mmbase.org:/tmp/cvs-serv1514/workflow/src/java/com/finalist/cmsc/workflow/forms
Modified Files:
AssetWorkflowAction.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/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1087
Index: AssetWorkflowAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/AssetWorkflowAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AssetWorkflowAction.java 10 Nov 2008 05:47:28 -0000 1.1
+++ AssetWorkflowAction.java 10 Nov 2008 05:52:49 -0000 1.2
@@ -11,7 +11,7 @@
import org.mmbase.bridge.*;
-import com.finalist.cmsc.repository.ContentElementUtil;
+import com.finalist.cmsc.repository.AssetElementUtil;
import com.finalist.cmsc.repository.RepositoryUtil;
import com.finalist.cmsc.workflow.*;
@@ -19,31 +19,31 @@
@Override
protected String getWorkflowType() {
- return ContentWorkflow.TYPE_CONTENT;
+ return AssetWorkflow.TYPE_ASSET;
}
@Override
protected NodeQuery createDetailQuery(Cloud cloud, String orderby, boolean
aord) {
- NodeManager manager =
cloud.getNodeManager(ContentElementUtil.CONTENTELEMENT);
+ NodeManager manager =
cloud.getNodeManager(AssetElementUtil.ASSETELEMENT);
NodeQuery wfQuery = WorkflowManager.createDetailQuery(cloud, manager);
NodeManager channelManager =
cloud.getNodeManager(RepositoryUtil.CONTENTCHANNEL);
wfQuery.addRelationStep(channelManager, RepositoryUtil.CREATIONREL,
null);
- wfQuery.addField(ContentElementUtil.CONTENTELEMENT + ".number");
- wfQuery.addField(ContentElementUtil.CONTENTELEMENT + "." +
ContentElementUtil.TITLE_FIELD);
- wfQuery.addField(ContentElementUtil.CONTENTELEMENT + "." +
ContentElementUtil.LASTMODIFIEDDATE_FIELD);
- wfQuery.addField(ContentElementUtil.CONTENTELEMENT + "." +
ContentElementUtil.LASTMODIFIER_FIELD);
- wfQuery.addField(RepositoryUtil.CONTENTCHANNEL + "." +
RepositoryUtil.NAME_FIELD);
- if (orderby.equals(ContentElementUtil.TITLE_FIELD)) {
- addOrderBy(manager, wfQuery, ContentElementUtil.TITLE_FIELD, aord);
+ wfQuery.addField(AssetElementUtil.ASSETELEMENT + ".number");
+ wfQuery.addField(AssetElementUtil.ASSETELEMENT + "." +
AssetElementUtil.TITLE_FIELD);
+ wfQuery.addField(AssetElementUtil.ASSETELEMENT + "." +
AssetElementUtil.LASTMODIFIEDDATE_FIELD);
+ wfQuery.addField(AssetElementUtil.ASSETELEMENT + "." +
AssetElementUtil.LASTMODIFIER_FIELD);
+ wfQuery.addField(RepositoryUtil.ASSETELEMENT + "." +
RepositoryUtil.NAME_FIELD);
+ if (orderby.equals(AssetElementUtil.TITLE_FIELD)) {
+ addOrderBy(manager, wfQuery, AssetElementUtil.TITLE_FIELD, aord);
}
- else if (orderby.equals(ContentElementUtil.LASTMODIFIER_FIELD)) {
- addOrderBy(manager, wfQuery, ContentElementUtil.LASTMODIFIER_FIELD,
aord);
+ else if (orderby.equals(AssetElementUtil.LASTMODIFIER_FIELD)) {
+ addOrderBy(manager, wfQuery, AssetElementUtil.LASTMODIFIER_FIELD,
aord);
}
- else if (orderby.equals(ContentElementUtil.LASTMODIFIEDDATE_FIELD)) {
- addOrderBy(manager, wfQuery,
ContentElementUtil.LASTMODIFIEDDATE_FIELD, aord);
+ else if (orderby.equals(AssetElementUtil.LASTMODIFIEDDATE_FIELD)) {
+ addOrderBy(manager, wfQuery, AssetElementUtil.LASTMODIFIEDDATE_FIELD,
aord);
}
else if (orderby.equals(RepositoryUtil.CONTENTCHANNEL)) {
addOrderBy(channelManager, wfQuery, RepositoryUtil.NAME_FIELD, aord);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
