Author: raintang
Date: 2009-10-29 06:35:27 +0100 (Thu, 29 Oct 2009)
New Revision: 39422
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml/XMLController.java
Log:
CMSC-1574 When an article is saved or published, the close-action of an
EditWizard also adds duplicate versions of assets
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml/XMLController.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml/XMLController.java
2009-10-28 22:25:57 UTC (rev 39421)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml/XMLController.java
2009-10-29 05:35:27 UTC (rev 39422)
@@ -230,18 +230,19 @@
processedNodes.put(Integer.valueOf(node.getNumber()), node);
- if (addRelations &&
!nodesSeenButNotProcessed.contains(Integer.valueOf(node.getNumber()))) {
- RelationManagerList rml =
manager.getAllowedRelations((NodeManager) null, null, "DESTINATION");
- RelationManagerIterator rmi = rml.relationManagerIterator();
- while (rmi.hasNext()) {
- RelationManager rm = rmi.nextRelationManager();
-
- if (isRelationAllowed(rm)) {
- toXmlRelations(node, document, nodeElement, rm,
addRelations, fieldsAsAttribute, processedNodes,
- nodesSeenButNotProcessed);
- }
- }
- }
+// Ignore relations in an article. CMSC-1574
+// if (addRelations &&
!nodesSeenButNotProcessed.contains(Integer.valueOf(node.getNumber()))) {
+// RelationManagerList rml =
manager.getAllowedRelations((NodeManager) null, null, "DESTINATION");
+// RelationManagerIterator rmi = rml.relationManagerIterator();
+// while (rmi.hasNext()) {
+// RelationManager rm = rmi.nextRelationManager();
+//
+// if (isRelationAllowed(rm)) {
+// toXmlRelations(node, document, nodeElement, rm,
addRelations, fieldsAsAttribute, processedNodes,
+// nodesSeenButNotProcessed);
+// }
+// }
+// }
processedNodes.remove(Integer.valueOf(node.getNumber()));
if (root == null) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
