You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/02/10 22:02:06 UTC
svn commit: r743100 - in /ofbiz/trunk/applications:
accounting/servicedef/services_invoice.xml content/servicedef/services.xml
content/servicedef/services_email.xml
Author: jleroux
Date: Tue Feb 10 21:02:06 2009
New Revision: 743100
URL: http://svn.apache.org/viewvc?rev=743100&view=rev
Log:
Here are some complements for r743056
I don't know what to think for
sendMailMultiPart bodyParts (actually I did not look further, I think it should be done earlier - if ever - at this stage it's too late)
sendMailFromScreen bodyParameters
I don't think it's needed for
createEmailContent plainBody
updateEmailContent plainBody
Modified:
ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml
ofbiz/trunk/applications/content/servicedef/services.xml
ofbiz/trunk/applications/content/servicedef/services_email.xml
Modified: ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml?rev=743100&r1=743099&r2=743100&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml Tue Feb 10 21:02:06 2009
@@ -247,7 +247,7 @@
<attribute name="sendTo" type="String" mode="IN" optional="false"/>
<attribute name="sendCc" type="String" mode="IN" optional="true"/>
<attribute name="subject" type="String" mode="IN" optional="true"/>
- <attribute name="bodyText" type="String" mode="IN" optional="true"/>
+ <attribute name="bodyText" type="String" mode="IN" optional="true" allow-html="any"/>
<attribute name="other" type="String" mode="IN" optional="true"/><!-- to send the invoice in the 'other' currency (y) -->
</service>
<service name="checkInvoicePaymentApplications" engine="java"
Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=743100&r1=743099&r2=743100&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services.xml Tue Feb 10 21:02:06 2009
@@ -267,7 +267,7 @@
<auto-attributes mode="IN" entity-name="Content" optional="true"/>
<attribute name="subject" type="String" mode="IN" optional="false"/>
<attribute name="plainBody" type="String" mode="IN" optional="false"/>
- <attribute name="htmlBody" type="String" mode="IN" optional="true"/>
+ <attribute name="htmlBody" type="String" mode="IN" optional="true" allow-html="any"/>
<override name="contentId" mode="INOUT"/>
</service>
<service name="updateEmailContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="updateEmailContent">
@@ -276,7 +276,7 @@
<attribute name="plainBodyDataResourceId" type="String" mode="IN" optional="true"/>
<attribute name="plainBody" type="String" mode="IN" optional="true"/>
<attribute name="htmlBodyDataResourceId" type="String" mode="IN" optional="true"/>
- <attribute name="htmlBody" type="String" mode="IN" optional="true"/>
+ <attribute name="htmlBody" type="String" mode="IN" optional="true" allow-html="any"/>
</service>
<service name="createDownloadContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="createDownloadContent">
Modified: ofbiz/trunk/applications/content/servicedef/services_email.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_email.xml?rev=743100&r1=743099&r2=743100&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_email.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_email.xml Tue Feb 10 21:02:06 2009
@@ -65,8 +65,8 @@
location="org.ofbiz.content.email.EmailServices" invoke="sendMailFromUrl">
<description>Send E-Mail From URL Service</description>
<implements service="sendMailInterface"/>
- <attribute name="bodyUrl" type="String" mode="IN" optional="false"/>
- <attribute name="bodyUrlParameters" type="Map" mode="IN" optional="true"/>
+ <attribute name="bodyUrl" type="String" mode="IN" optional="false" allow-html="any"/>
+ <attribute name="bodyUrlParameters" type="Map" mode="IN" optional="true" allow-html="any"/>
<attribute name="body" type="String" mode="OUT" optional="false" allow-html="any"/>
</service>
<service name="sendMailFromScreen" max-retry="3" engine="java"