Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv9718/src/webapp/editors/config/newsletter
Modified Files:
edit_newsletter.xml load_newsletter.xml
search_newsletter_posrel_tag.xml
Added Files:
search_article_insrel_tag.xml search_tag.xml
Log Message:
CMSC-711,Customized search option for edit-wizard,add tag relation into
newsletter
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-711
search_article_insrel_tag.xml is new
search_tag.xml is new
Index: edit_newsletter.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- edit_newsletter.xml 18 Apr 2008 06:15:39 -0000 1.10
+++ edit_newsletter.xml 28 Apr 2008 07:47:17 -0000 1.11
@@ -100,5 +100,5 @@
<list include="config/layout/search_page_layoutrel_layout.xml" />
<list include="config/images/search_page_namedrel_images.xml" />
<list include="config/attachments/search_newsletter_posrel_attachments.xml"
/>
- <list
include="config/newslettertheme/search_newsletter_related_newslettertheme.xml"
/>
+ <list include="config/newsletter/search_newsletter_posrel_tag.xml" />
</form-schema>
Index: load_newsletter.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- load_newsletter.xml 18 Apr 2008 06:15:39 -0000 1.10
+++ load_newsletter.xml 28 Apr 2008 07:47:17 -0000 1.11
@@ -26,10 +26,10 @@
<field name="txtempty" />
<field name="schedule" />
<relation destination="attachments" role="posrel" />
+ <relation destination="tag" role="posrel" />
<relation destination="images" role="namedrel" />
<relation destination="layout" role="allowrel" />
<relation destination="layout" role="layoutrel" />
<relation destination="page" role="navrel" />
<relation destination="portlet" role="portletrel" />
- <relation destination="newslettertheme" role="newslettertheme" />
</action>
Index: search_newsletter_posrel_tag.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/search_newsletter_posrel_tag.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- search_newsletter_posrel_tag.xml 17 Apr 2008 10:14:03 -0000 1.1
+++ search_newsletter_posrel_tag.xml 28 Apr 2008 07:47:17 -0000 1.2
@@ -1,28 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!DOCTYPE list PUBLIC "-//MMBase/DTD editwizard 1.0//EN"
"http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";>
<list role="posrel" destination="tag" minoccurs="0" maxoccurs="*"
orderby="[EMAIL PROTECTED]'pos']" ordertype="number">
<title xml:lang="nl"></title>
<title xml:lang="en">TAG</title>
- <title xml:lang="zh">æ ç¾</title>
+
<item>
<field name="name" dtrequired="true">
<prompt xml:lang="en">Name</prompt>
<prompt xml:lang="nl">Name</prompt>
- <prompt xml:lang="zh">å称</prompt>
</field>
</item>
<command name="search" nodepath="tag" age="-1" fields="name">
<prompt xml:lang="en">Search tag</prompt>
<prompt xml:lang="nl">Zoek bijlage</prompt>
- <prompt xml:lang="zh">æ¥æ¾æ ç¾</prompt>
+
<search-filter>
<name xml:lang="en">Name</name>
<name xml:lang="nl">Titel</name>
- <name xml:lang="zh">æ ç¾</name>
+
<search-fields>[name]</search-fields>
</search-filter>
</command>
@@ -30,13 +29,15 @@
<command name="insert" objectnumber="new">
<prompt xml:lang="en">New</prompt>
<prompt xml:lang="nl">Nieuw</prompt>
- <prompt xml:lang="zh">æ°å»º</prompt>
+
</command>
<action type="create">
<relation destinationtype="tag" role="posrel">
<field name="pos">{sum(//[EMAIL PROTECTED]'posrel' and
@firstitem='true']/[EMAIL PROTECTED]'tag']/../[EMAIL
PROTECTED]'pos'])-{$pos}}</field>
- <object type="tag"></object>
+ <object type="tag">
+ <field name="subject">[EMAIL PROTECTED]'newsletter']/[EMAIL
PROTECTED]'title']}</field>
+ </object>
</relation>
</action>
</list>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
