Update of 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article
In directory james.mmbase.org:/tmp/cvs-serv16789

Modified Files:
        article.xml load_article.xml 
Log Message:
CMSC-814    Link content to newsletter


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article
See also: http://www.mmbase.org/jira/browse/CMSC-814


Index: article.xml
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article/article.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- article.xml 17 Apr 2008 04:55:11 -0000      1.9
+++ article.xml 17 Apr 2008 10:08:08 -0000      1.10
@@ -19,14 +19,14 @@
       <step form-schema="edit_article"/>
       <step form-schema="edit_contentfields"/>      
 
-      <step form-schema="article_related_newslettertheme"/> 
+      <step form-schema="search_article_insrel_newsletter"/> 
 
       <step form-schema="edit_contentinfo"/>
    </steps>
    <form-schema id="edit_article" extends="config/article/edit_article.xml"/>
    <form-schema id="edit_contentfields" 
extends="config/contentelement/edit_contentfields.xml"/>
 
-   <form-schema id="article_related_newslettertheme" 
extends="config/newslettertheme/article_related_newslettertheme.xml"/> 
+   <form-schema id="search_article_insrel_newsletter" 
extends="config/newsletter/search_article_insrel_newsletter.xml"/> 
 
    <form-schema id="edit_contentinfo" 
extends="config/contentelement/edit_contentinfo.xml"/>
 </wizard-schema>


Index: load_article.xml
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/article/load_article.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- load_article.xml    17 Apr 2008 05:11:45 -0000      1.7
+++ load_article.xml    17 Apr 2008 10:08:08 -0000      1.8
@@ -24,9 +24,11 @@
        <relation destination="attachments" role="posrel" />
        <relation destination="images" role="imagerel" />
        <relation destination="urls" role="posrel" />
-
-       <relation destination="newslettertheme" role="newslettercontent" />
-
+   <relation destination="newsletter" role="newslettercontent" >
+      <object type="tag">
+             <relation destination="tag" role="posrel" />
+     </object>
+    </relation>
        <!-- content info relations -->
        <relation destination="contentchannel" role="creationrel" />
        <relation destination="contentchannel" role="contentrel" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to