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 2013/06/17 10:26:43 UTC
svn commit: r1493682 -
/ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
Author: jleroux
Date: Mon Jun 17 08:26:43 2013
New Revision: 1493682
URL: http://svn.apache.org/r1493682
Log:
A patch from Leon for "Allow text data of agrement and its items accept "<" and ">" characters" https://issues.apache.org/jira/browse/OFBIZ-5209
It's common that an agreement text body contains those "special" characters.
Modified:
ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
Modified: ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml?rev=1493682&r1=1493681&r2=1493682&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml Mon Jun 17 08:26:43 2013
@@ -30,6 +30,7 @@ under the License.
<permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<auto-attributes include="pk" mode="OUT" optional="true"/>
+ <override name="textData" allow-html="safe"/>
</service>
<service name="updateAgreement" default-entity-name="Agreement" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreement" auth="true">
@@ -37,6 +38,7 @@ under the License.
<permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="textData" allow-html="safe"/>
</service>
<service name="cancelAgreement" default-entity-name="Agreement" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="cancelAgreement" auth="true">
@@ -44,6 +46,7 @@ under the License.
<permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="textData" allow-html="safe"/>
</service>
<service name="copyAgreement" default-entity-name="Agreement" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="copyAgreement" auth="true">
@@ -63,6 +66,7 @@ under the License.
<permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="agreementText" allow-html="safe"/>
</service>
<service name="updateAgreementItem" default-entity-name="AgreementItem" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementItem" auth="true">
@@ -70,6 +74,7 @@ under the License.
<permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="agreementText" allow-html="safe"/>
</service>
<service name="removeAgreementItem" default-entity-name="AgreementItem" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="removeAgreementItem" auth="true">
@@ -77,6 +82,7 @@ under the License.
<permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="agreementText" allow-html="safe"/>
</service>
<!-- AgreementTerm -->
@@ -86,6 +92,7 @@ under the License.
<permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="agreementText" allow-html="safe"/>
</service>
<service name="updateAgreementTerm" default-entity-name="AgreementTerm" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementTerm" auth="true">
Re: svn commit: r1493682 -
/ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
Posted by Jacques Le Roux <ja...@les7arts.com>.
Thanks for report Adrian,
I guess Leon made a wrong C/P and the field is actually AgreementTerm.textValue I have also added it to updateAgreementTerm
Fixed at revision: 1527289
Jacques
Adrian Crum wrote:
> This commit generates a warning:
>
> 2013-09-28 10:17:59,427 (OFBiz-config-0) [
> ModelServiceReader.java:636:WARN ] No parameter found for override
> parameter named: agreementText in service createAgreementTerm
>
> Adrian Crum
> Sandglass Software
> www.sandglass-software.com
>
> On 6/17/2013 1:26 AM, jleroux@apache.org wrote:
>> Author: jleroux
>> Date: Mon Jun 17 08:26:43 2013
>> New Revision: 1493682
>>
>> URL: http://svn.apache.org/r1493682
>> Log:
>> A patch from Leon for "Allow text data of agrement and its items accept "<" and ">" characters"
>> https://issues.apache.org/jira/browse/OFBIZ-5209
>>
>> It's common that an agreement text body contains those "special" characters.
>>
>> Modified:
>> ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
>>
>> Modified: ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml?rev=1493682&r1=1493681&r2=1493682&view=diff
>> ============================================================================== ---
>> ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml (original) +++
>> ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml Mon Jun 17 08:26:43 2013 @@ -30,6 +30,7 @@ under the
>> License. <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
>> <auto-attributes include="nonpk" mode="IN" optional="true"/>
>> <auto-attributes include="pk" mode="OUT" optional="true"/>
>> + <override name="textData" allow-html="safe"/>
>> </service>
>> <service name="updateAgreement" default-entity-name="Agreement" engine="simple"
>> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml"
>> invoke="updateAgreement" auth="true"> @@ -37,6 +38,7 @@ under the License.
>> <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
>> <auto-attributes include="pk" mode="IN" optional="false"/>
>> <auto-attributes include="nonpk" mode="IN" optional="true"/>
>> + <override name="textData" allow-html="safe"/>
>> </service>
>> <service name="cancelAgreement" default-entity-name="Agreement" engine="simple"
>> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml"
>> invoke="cancelAgreement" auth="true"> @@ -44,6 +46,7 @@ under the License.
>> <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
>> <auto-attributes include="pk" mode="IN" optional="false"/>
>> <auto-attributes include="nonpk" mode="IN" optional="true"/>
>> + <override name="textData" allow-html="safe"/>
>> </service>
>> <service name="copyAgreement" default-entity-name="Agreement" engine="simple"
>> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml"
>> invoke="copyAgreement" auth="true"> @@ -63,6 +66,7 @@ under the License.
>> <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
>> <auto-attributes include="pk" mode="INOUT" optional="true"/>
>> <auto-attributes include="nonpk" mode="IN" optional="true"/>
>> + <override name="agreementText" allow-html="safe"/>
>> </service>
>> <service name="updateAgreementItem" default-entity-name="AgreementItem" engine="simple"
>> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml"
>> invoke="updateAgreementItem" auth="true"> @@ -70,6 +74,7 @@ under the License.
>> <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
>> <auto-attributes include="pk" mode="IN" optional="true"/>
>> <auto-attributes include="nonpk" mode="IN" optional="true"/>
>> + <override name="agreementText" allow-html="safe"/>
>> </service>
>> <service name="removeAgreementItem" default-entity-name="AgreementItem" engine="simple"
>> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml"
>> invoke="removeAgreementItem" auth="true"> @@ -77,6 +82,7 @@ under the License.
>> <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
>> <auto-attributes include="pk" mode="INOUT" optional="true"/>
>> <auto-attributes include="nonpk" mode="IN" optional="true"/>
>> + <override name="agreementText" allow-html="safe"/>
>> </service>
>>
>> <!-- AgreementTerm -->
>> @@ -86,6 +92,7 @@ under the License.
>> <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
>> <auto-attributes include="pk" mode="INOUT" optional="true"/>
>> <auto-attributes include="nonpk" mode="IN" optional="true"/>
>> + <override name="agreementText" allow-html="safe"/>
>> </service>
>> <service name="updateAgreementTerm" default-entity-name="AgreementTerm" engine="simple"
>> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml"
>> invoke="updateAgreementTerm" auth="true">
Re: svn commit: r1493682 - /ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
Posted by Adrian Crum <ad...@sandglass-software.com>.
This commit generates a warning:
2013-09-28 10:17:59,427 (OFBiz-config-0) [
ModelServiceReader.java:636:WARN ] No parameter found for override
parameter named: agreementText in service createAgreementTerm
Adrian Crum
Sandglass Software
www.sandglass-software.com
On 6/17/2013 1:26 AM, jleroux@apache.org wrote:
> Author: jleroux
> Date: Mon Jun 17 08:26:43 2013
> New Revision: 1493682
>
> URL: http://svn.apache.org/r1493682
> Log:
> A patch from Leon for "Allow text data of agrement and its items accept "<" and ">" characters" https://issues.apache.org/jira/browse/OFBIZ-5209
>
> It's common that an agreement text body contains those "special" characters.
>
> Modified:
> ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
>
> Modified: ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml?rev=1493682&r1=1493681&r2=1493682&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml (original)
> +++ ofbiz/trunk/applications/accounting/servicedef/services_agreement.xml Mon Jun 17 08:26:43 2013
> @@ -30,6 +30,7 @@ under the License.
> <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
> <auto-attributes include="nonpk" mode="IN" optional="true"/>
> <auto-attributes include="pk" mode="OUT" optional="true"/>
> + <override name="textData" allow-html="safe"/>
> </service>
> <service name="updateAgreement" default-entity-name="Agreement" engine="simple"
> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreement" auth="true">
> @@ -37,6 +38,7 @@ under the License.
> <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
> <auto-attributes include="pk" mode="IN" optional="false"/>
> <auto-attributes include="nonpk" mode="IN" optional="true"/>
> + <override name="textData" allow-html="safe"/>
> </service>
> <service name="cancelAgreement" default-entity-name="Agreement" engine="simple"
> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="cancelAgreement" auth="true">
> @@ -44,6 +46,7 @@ under the License.
> <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
> <auto-attributes include="pk" mode="IN" optional="false"/>
> <auto-attributes include="nonpk" mode="IN" optional="true"/>
> + <override name="textData" allow-html="safe"/>
> </service>
> <service name="copyAgreement" default-entity-name="Agreement" engine="simple"
> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="copyAgreement" auth="true">
> @@ -63,6 +66,7 @@ under the License.
> <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
> <auto-attributes include="pk" mode="INOUT" optional="true"/>
> <auto-attributes include="nonpk" mode="IN" optional="true"/>
> + <override name="agreementText" allow-html="safe"/>
> </service>
> <service name="updateAgreementItem" default-entity-name="AgreementItem" engine="simple"
> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementItem" auth="true">
> @@ -70,6 +74,7 @@ under the License.
> <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
> <auto-attributes include="pk" mode="IN" optional="true"/>
> <auto-attributes include="nonpk" mode="IN" optional="true"/>
> + <override name="agreementText" allow-html="safe"/>
> </service>
> <service name="removeAgreementItem" default-entity-name="AgreementItem" engine="simple"
> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="removeAgreementItem" auth="true">
> @@ -77,6 +82,7 @@ under the License.
> <permission-service service-name="acctgAgreementPermissionCheck" main-action="UPDATE"/>
> <auto-attributes include="pk" mode="INOUT" optional="true"/>
> <auto-attributes include="nonpk" mode="IN" optional="true"/>
> + <override name="agreementText" allow-html="safe"/>
> </service>
>
> <!-- AgreementTerm -->
> @@ -86,6 +92,7 @@ under the License.
> <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
> <auto-attributes include="pk" mode="INOUT" optional="true"/>
> <auto-attributes include="nonpk" mode="IN" optional="true"/>
> + <override name="agreementText" allow-html="safe"/>
> </service>
> <service name="updateAgreementTerm" default-entity-name="AgreementTerm" engine="simple"
> location="component://accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml" invoke="updateAgreementTerm" auth="true">
>
>