You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2009/02/09 12:05:34 UTC
svn commit: r742394 - in /ofbiz/trunk/applications:
content/servicedef/services.xml content/servicedef/services_data.xml
product/servicedef/services.xml
Author: jonesde
Date: Mon Feb 9 11:05:34 2009
New Revision: 742394
URL: http://svn.apache.org/viewvc?rev=742394&view=rev
Log:
Updated a few service defs that need to support html coming in, all using safe html for now
Modified:
ofbiz/trunk/applications/content/servicedef/services.xml
ofbiz/trunk/applications/content/servicedef/services_data.xml
ofbiz/trunk/applications/product/servicedef/services.xml
Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=742394&r1=742393&r2=742394&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services.xml Mon Feb 9 11:05:34 2009
@@ -291,12 +291,12 @@
<service name="createSimpleTextContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="createSimpleTextContent">
<auto-attributes mode="IN" entity-name="Content" optional="true"/>
- <attribute name="text" type="String" mode="IN" optional="false"/>
+ <attribute name="text" type="String" mode="IN" optional="false" allow-html="safe"/>
<override name="contentId" mode="INOUT"/>
</service>
<service name="updateSimpleTextContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="updateSimpleTextContent">
<attribute name="textDataResourceId" type="String" mode="IN" optional="true"/>
- <attribute name="text" type="String" mode="IN" optional="true"/>
+ <attribute name="text" type="String" mode="IN" optional="true" allow-html="safe"/>
</service>
<!-- Util -->
Modified: ofbiz/trunk/applications/content/servicedef/services_data.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_data.xml?rev=742394&r1=742393&r2=742394&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_data.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_data.xml Mon Feb 9 11:05:34 2009
@@ -36,6 +36,7 @@
<attribute name="partyId" type="String" mode="IN" optional="true"/>
<attribute name="dataResourceId" type="String" mode="OUT" optional="false"/>
<attribute name="dataResource" type="GenericValue" mode="OUT" optional="true"/>
+ <override name="objectInfo" allow-html="safe"/>
</service>
<service name="updateDataResource" engine="simple" default-entity-name="DataResource" auth="true"
location="org/ofbiz/content/data/DataServices.xml" invoke="updateDataResource">
@@ -48,6 +49,7 @@
<attribute name="skipPermissionCheck" type="String" mode="IN" optional="true"/>
<attribute name="dataResourceId" type="String" mode="OUT" optional="false"/>
<attribute name="dataResource" type="GenericValue" mode="OUT" optional="true"/>
+ <override name="objectInfo" allow-html="safe"/>
</service>
<service name="removeDataResource" engine="simple" default-entity-name="DataResource" auth="true"
location="org/ofbiz/content/data/DataServices.xml" invoke="deleteDataResource">
@@ -102,6 +104,7 @@
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="dataResourceTypeId" default-value="ELECTRONIC_TEXT"/>
+ <override name="textData" allow-html="safe"/>
</service>
<service name="updateElectronicText" default-entity-name="ElectronicText" engine="simple"
location="org/ofbiz/content/data/DataServices.xml" invoke="updateElectronicText" auth="true">
@@ -110,6 +113,7 @@
<auto-attributes include="pk" mode="INOUT" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<attribute name="contentId" mode="INOUT" optional="true" type="String"/><!-- to optionaly know where this text is belonging to -->
+ <override name="textData" allow-html="safe"/>
</service>
<service name="removeElectronicText" default-entity-name="ElectronicText" engine="simple"
location="org/ofbiz/content/data/DataServices.xml" invoke="removeElectronicText" auth="true">
Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=742394&r1=742393&r2=742394&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Mon Feb 9 11:05:34 2009
@@ -34,6 +34,8 @@
<exclude field-name="lastModifiedDate"/>
<exclude field-name="lastModifiedByUserLogin"/>
</auto-attributes>
+ <override name="description" allow-html="safe"/>
+ <override name="longDescription" allow-html="safe"/>
</service>
<service name="createProduct" default-entity-name="Product" engine="simple"
location="org/ofbiz/product/product/ProductServices.xml" invoke="createProduct" auth="true">
@@ -366,7 +368,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="safe"/>
<override name="contentId" optional="true" mode="INOUT"/>
</service>
<service name="updateEmailContentForProduct" default-entity-name="ProductContent" engine="simple"
@@ -379,7 +381,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="safe"/>
</service>
<service name="createDownloadContentForProduct" default-entity-name="ProductContent" engine="simple"
location="org/ofbiz/product/product/ProductContentServices.xml" invoke="createDownloadContentForProduct" auth="true">
@@ -405,7 +407,7 @@
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/>
- <attribute name="text" type="String" mode="IN" optional="false"/>
+ <attribute name="text" type="String" mode="IN" optional="false" allow-html="safe"/>
<override name="contentId" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
@@ -415,13 +417,13 @@
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<auto-attributes mode="IN" entity-name="Content" optional="true"/>
<attribute name="textDataResourceId" type="String" mode="IN" optional="true"/>
- <attribute name="text" type="String" mode="IN" optional="true"/>
+ <attribute name="text" type="String" mode="IN" optional="true" allow-html="safe"/>
</service>
<service name="createSimpleTextContentForAlternateLocale" engine="simple" location="org/ofbiz/product/product/ProductContentServices.xml" invoke="createSimpleTextContentForAlternateLocale">
<auto-attributes mode="IN" entity-name="Content" optional="true"/>
<attribute name="mainContentId" type="String" mode="IN" optional="false"/>
- <attribute name="text" type="String" mode="IN" optional="false"/>
+ <attribute name="text" type="String" mode="IN" optional="false" allow-html="safe"/>
<override name="localeString" optional="false"/>
<override name="contentId" mode="INOUT"/>
</service>