Update of 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans
In directory james.mmbase.org:/tmp/cvs-serv2169

Modified Files:
        CreateRelationsForSecondaryContent.java 
Log Message:
CMSC-1192 Assets: add SQL script to migrate all images/attachments/URLs to new 
assetstable


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans
See also: http://www.mmbase.org/jira/browse/CMSC-1192


Index: CreateRelationsForSecondaryContent.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans/CreateRelationsForSecondaryContent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CreateRelationsForSecondaryContent.java     24 Dec 2008 13:16:33 -0000      
1.5
+++ CreateRelationsForSecondaryContent.java     24 Dec 2008 13:17:43 -0000      
1.6
@@ -50,7 +50,7 @@
          Node asset = assets.getNode(i);
          if (!RepositoryUtil.hasCreationChannel(asset)) {
             Relation relation = RelationUtil.createRelation(asset, root, 
"creationrel");
-            if(Publish.isPublished(asset)) {
+            if(Publish.isPublished(asset) && Publish.isPublishable(relation)) {
                Publish.publish(relation);
             }
             else {
@@ -65,7 +65,7 @@
          int owners = asset.countRelatedNodes(ownerManager, "ownerrel", 
"destination");
          if (owners < 1) {  
             Relation relation = RelationUtil.createRelation(asset, user, 
"ownerrel");
-            if(Publish.isPublished(asset)) {
+            if(Publish.isPublished(asset) && Publish.isPublishable(relation)) {
                Publish.publish(relation);
             }
          }
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to