Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv27493/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentMassDeleteAction.java SearchAction.java
AssetSearchAction.java LinkToChannelAction.java
ContentSearchAction.java ChannelDelete.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: ContentMassDeleteAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentMassDeleteAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ContentMassDeleteAction.java 27 Jun 2008 01:51:56 -0000 1.2
+++ ContentMassDeleteAction.java 30 Dec 2008 11:13:59 -0000 1.3
@@ -55,8 +55,8 @@
// unpublish and remove from workflow
Publish.remove(contentNode);
- Publish.unpublish(contentNode);
Workflow.remove(contentNode);
+ Publish.unpublish(contentNode);
}
else{
numbers.add(contentNode.getNumber());
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.19
diff -u -b -r1.18 -r1.19
--- SearchAction.java 25 Jul 2008 15:54:05 -0000 1.18
+++ SearchAction.java 30 Dec 2008 11:13:59 -0000 1.19
@@ -299,8 +299,8 @@
// unpublish and remove from workflow
Publish.remove(objectNode);
- Publish.unpublish(objectNode);
Workflow.remove(objectNode);
+ Publish.unpublish(objectNode);
}
}
Index: AssetSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- AssetSearchAction.java 26 Dec 2008 08:50:55 -0000 1.10
+++ AssetSearchAction.java 30 Dec 2008 11:13:59 -0000 1.11
@@ -312,8 +312,8 @@
// unpublish and remove from workflow
Publish.remove(objectNode);
- Publish.unpublish(objectNode);
Workflow.remove(objectNode);
+ Publish.unpublish(objectNode);
}
}
Index: LinkToChannelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/LinkToChannelAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- LinkToChannelAction.java 18 Nov 2008 01:52:47 -0000 1.13
+++ LinkToChannelAction.java 30 Dec 2008 11:13:59 -0000 1.14
@@ -67,8 +67,8 @@
}
// unpublish and remove from workflow
Publish.remove(objectNode);
- Publish.unpublish(objectNode);
Workflow.remove(objectNode);
+ Publish.unpublish(objectNode);
}
else {
String destinationnumber = getParameter(request,
"destionationchannel");
@@ -84,8 +84,8 @@
// unpublish and remove from workflow
Publish.remove(objectNode);
- Publish.unpublish(objectNode);
Workflow.remove(objectNode);
+ Publish.unpublish(objectNode);
}
else {
RepositoryUtil.addCreationChannel(objectNode,
newCreationNode);
Index: ContentSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ContentSearchAction.java 26 Dec 2008 11:20:44 -0000 1.4
+++ ContentSearchAction.java 30 Dec 2008 11:13:59 -0000 1.5
@@ -313,8 +313,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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ChannelDelete.java 18 Nov 2008 01:52:47 -0000 1.11
+++ ChannelDelete.java 30 Dec 2008 11:13:59 -0000 1.12
@@ -166,7 +166,7 @@
private void unpublish(Node elementNode) {
Publish.remove(elementNode);
- Publish.unpublish(elementNode);
Workflow.remove(elementNode);
+ Publish.unpublish(elementNode);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
