Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv27461/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
Tag: b1_5
SearchAction.java ChannelDelete.java LinkToChannelAction.java
Log Message:
CMSC-1210 Items are not unpublished when moved to trash and a workflow exists
in status publish
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1210
Index: SearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchAction.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -b -r1.18 -r1.18.2.1
--- SearchAction.java 25 Jul 2008 15:54:05 -0000 1.18
+++ SearchAction.java 30 Dec 2008 11:13:47 -0000 1.18.2.1
@@ -299,8 +299,8 @@
// unpublish and remove from workflow
Publish.remove(objectNode);
- Publish.unpublish(objectNode);
Workflow.remove(objectNode);
+ Publish.unpublish(objectNode);
}
}
Index: ChannelDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ChannelDelete.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- ChannelDelete.java 1 Oct 2008 11:05:04 -0000 1.9.2.1
+++ ChannelDelete.java 30 Dec 2008 11:13:47 -0000 1.9.2.2
@@ -116,8 +116,8 @@
private void deleteChannel(Node channelNode) {
Publish.remove(channelNode);
- Publish.unpublish(channelNode);
Workflow.remove(channelNode);
+ Publish.unpublish(channelNode);
channelNode.delete(true);
}
@@ -130,8 +130,8 @@
// unpublish and remove from workflow
Publish.remove(elementNode);
- Publish.unpublish(elementNode);
Workflow.remove(elementNode);
+ Publish.unpublish(elementNode);
}
private void moveElementToTrash(Cloud cloud, Node channelNode, Node
elementNode) {
@@ -144,8 +144,8 @@
// unpublish and remove from workflow
Publish.remove(elementNode);
- Publish.unpublish(elementNode);
Workflow.remove(elementNode);
+ Publish.unpublish(elementNode);
}
}
Index: LinkToChannelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/LinkToChannelAction.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -b -r1.12 -r1.12.2.1
--- LinkToChannelAction.java 27 Jun 2008 01:51:56 -0000 1.12
+++ LinkToChannelAction.java 30 Dec 2008 11:13:47 -0000 1.12.2.1
@@ -47,8 +47,8 @@
// unpublish and remove from workflow
Publish.remove(objectNode);
- Publish.unpublish(objectNode);
Workflow.remove(objectNode);
+ Publish.unpublish(objectNode);
}
else {
String destinationnumber = getParameter(request,
"destionationchannel");
@@ -64,8 +64,8 @@
// unpublish and remove from workflow
Publish.remove(objectNode);
- Publish.unpublish(objectNode);
Workflow.remove(objectNode);
+ Publish.unpublish(objectNode);
}
else {
RepositoryUtil.addCreationChannel(objectNode,
newCreationNode);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
