You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2010/10/27 06:21:05 UTC
svn commit: r1027811 - in /ofbiz/trunk/applications:
order/servicedef/services_request.xml workeffort/servicedef/services.xml
Author: hansbak
Date: Wed Oct 27 04:21:04 2010
New Revision: 1027811
URL: http://svn.apache.org/viewvc?rev=1027811&view=rev
Log:
allow 'safe' html in workeffort name, description and request description
Modified:
ofbiz/trunk/applications/order/servicedef/services_request.xml
ofbiz/trunk/applications/workeffort/servicedef/services.xml
Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=1027811&r1=1027810&r2=1027811&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_request.xml Wed Oct 27 04:21:04 2010
@@ -84,6 +84,7 @@ under the License.
<auto-attributes include="pk" mode="INOUT" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="custRequestItemSeqId" optional="true"/>
+ <override name="description" allow-html="safe"/>
<override name="story" allow-html="safe"/>
</service>
<service name="updateCustRequestItem" engine="simple" default-entity-name="CustRequestItem"
Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=1027811&r1=1027810&r2=1027811&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Wed Oct 27 04:21:04 2010
@@ -46,11 +46,10 @@ under the License.
<attribute name="requirementId" type="String" mode="IN" optional="true"/>
<attribute name="custRequestId" type="String" mode="IN" optional="true"/>
<attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
+ <attribute name="workEffortName" optional="false" allow-html="safe"/>
+ <attribute name="description" allow-html="safe"/>
<override name="workEffortTypeId" optional="false"/>
- <override name="workEffortName" optional="false"/>
<override name="currentStatusId" optional="false"/>
- <override name="workEffortName" allow-html="safe" />
- <override name="description" allow-html="safe" />
</service>
<service name="createWorkEffortAndPartyAssign" default-entity-name="WorkEffort" engine="simple"
location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortAndPartyAssign">
@@ -76,6 +75,8 @@ under the License.
<auto-attributes mode="IN" include="pk" optional="false"/>
<attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
<attribute name="reason" type="String" mode="IN" optional="true"/>
+ <attribute name="workEffortName" allow-html="safe"/>
+ <attribute name="description" allow-html="safe"/>
</service>
<service name="deleteWorkEffort" default-entity-name="WorkEffort" engine="simple"
location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffort">
@@ -363,6 +364,7 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequest"/>
<override name="custRequestId" optional="true" mode="INOUT"/>
+ <override name="description" allow-html="safe"/>
</service>
<service name="deleteWorkEffortRequest" engine="simple" location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequest" auth="true">
<description>Deletes a CustRequestWorkEffort</description>
Re: svn commit: r1027811 - in /ofbiz/trunk/applications:
order/servicedef/services_request.xml workeffort/servicedef/services.xml
Posted by Hans Bakker <ma...@antwebsystems.com>.
to contain the following text:
if i go to function accounting --> invoice i get an error: correct.
regards,
Hans
On Wed, 2010-10-27 at 07:18 -0700, Adrian Crum wrote:
> Why would you put HTML in a work effort description?
>
> -Adrian
>
> On 10/26/2010 9:21 PM, hansbak@apache.org wrote:
> > Author: hansbak
> > Date: Wed Oct 27 04:21:04 2010
> > New Revision: 1027811
> >
> > URL: http://svn.apache.org/viewvc?rev=1027811&view=rev
> > Log:
> > allow 'safe' html in workeffort name, description and request description
> >
> > Modified:
> > ofbiz/trunk/applications/order/servicedef/services_request.xml
> > ofbiz/trunk/applications/workeffort/servicedef/services.xml
> >
> > Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=1027811&r1=1027810&r2=1027811&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
> > +++ ofbiz/trunk/applications/order/servicedef/services_request.xml Wed Oct 27 04:21:04 2010
> > @@ -84,6 +84,7 @@ under the License.
> > <auto-attributes include="pk" mode="INOUT" optional="false"/>
> > <auto-attributes include="nonpk" mode="IN" optional="true"/>
> > <override name="custRequestItemSeqId" optional="true"/>
> > +<override name="description" allow-html="safe"/>
> > <override name="story" allow-html="safe"/>
> > </service>
> > <service name="updateCustRequestItem" engine="simple" default-entity-name="CustRequestItem"
> >
> > Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=1027811&r1=1027810&r2=1027811&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
> > +++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Wed Oct 27 04:21:04 2010
> > @@ -46,11 +46,10 @@ under the License.
> > <attribute name="requirementId" type="String" mode="IN" optional="true"/>
> > <attribute name="custRequestId" type="String" mode="IN" optional="true"/>
> > <attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
> > +<attribute name="workEffortName" optional="false" allow-html="safe"/>
> > +<attribute name="description" allow-html="safe"/>
> > <override name="workEffortTypeId" optional="false"/>
> > -<override name="workEffortName" optional="false"/>
> > <override name="currentStatusId" optional="false"/>
> > -<override name="workEffortName" allow-html="safe" />
> > -<override name="description" allow-html="safe" />
> > </service>
> > <service name="createWorkEffortAndPartyAssign" default-entity-name="WorkEffort" engine="simple"
> > location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortAndPartyAssign">
> > @@ -76,6 +75,8 @@ under the License.
> > <auto-attributes mode="IN" include="pk" optional="false"/>
> > <attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
> > <attribute name="reason" type="String" mode="IN" optional="true"/>
> > +<attribute name="workEffortName" allow-html="safe"/>
> > +<attribute name="description" allow-html="safe"/>
> > </service>
> > <service name="deleteWorkEffort" default-entity-name="WorkEffort" engine="simple"
> > location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffort">
> > @@ -363,6 +364,7 @@ under the License.
> > <auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
> > <auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequest"/>
> > <override name="custRequestId" optional="true" mode="INOUT"/>
> > +<override name="description" allow-html="safe"/>
> > </service>
> > <service name="deleteWorkEffortRequest" engine="simple" location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequest" auth="true">
> > <description>Deletes a CustRequestWorkEffort</description>
> >
> >
> >
--
Ofbiz on twitter: http://twitter.com/apache_ofbiz
Myself on twitter: http://twitter.com/hansbak
Antwebsystems.com: Quality services for competitive rates.
Re: svn commit: r1027811 - in /ofbiz/trunk/applications: order/servicedef/services_request.xml
workeffort/servicedef/services.xml
Posted by Adrian Crum <ad...@hlmksw.com>.
Why would you put HTML in a work effort description?
-Adrian
On 10/26/2010 9:21 PM, hansbak@apache.org wrote:
> Author: hansbak
> Date: Wed Oct 27 04:21:04 2010
> New Revision: 1027811
>
> URL: http://svn.apache.org/viewvc?rev=1027811&view=rev
> Log:
> allow 'safe' html in workeffort name, description and request description
>
> Modified:
> ofbiz/trunk/applications/order/servicedef/services_request.xml
> ofbiz/trunk/applications/workeffort/servicedef/services.xml
>
> Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=1027811&r1=1027810&r2=1027811&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
> +++ ofbiz/trunk/applications/order/servicedef/services_request.xml Wed Oct 27 04:21:04 2010
> @@ -84,6 +84,7 @@ under the License.
> <auto-attributes include="pk" mode="INOUT" optional="false"/>
> <auto-attributes include="nonpk" mode="IN" optional="true"/>
> <override name="custRequestItemSeqId" optional="true"/>
> +<override name="description" allow-html="safe"/>
> <override name="story" allow-html="safe"/>
> </service>
> <service name="updateCustRequestItem" engine="simple" default-entity-name="CustRequestItem"
>
> Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=1027811&r1=1027810&r2=1027811&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
> +++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Wed Oct 27 04:21:04 2010
> @@ -46,11 +46,10 @@ under the License.
> <attribute name="requirementId" type="String" mode="IN" optional="true"/>
> <attribute name="custRequestId" type="String" mode="IN" optional="true"/>
> <attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
> +<attribute name="workEffortName" optional="false" allow-html="safe"/>
> +<attribute name="description" allow-html="safe"/>
> <override name="workEffortTypeId" optional="false"/>
> -<override name="workEffortName" optional="false"/>
> <override name="currentStatusId" optional="false"/>
> -<override name="workEffortName" allow-html="safe" />
> -<override name="description" allow-html="safe" />
> </service>
> <service name="createWorkEffortAndPartyAssign" default-entity-name="WorkEffort" engine="simple"
> location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortAndPartyAssign">
> @@ -76,6 +75,8 @@ under the License.
> <auto-attributes mode="IN" include="pk" optional="false"/>
> <attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
> <attribute name="reason" type="String" mode="IN" optional="true"/>
> +<attribute name="workEffortName" allow-html="safe"/>
> +<attribute name="description" allow-html="safe"/>
> </service>
> <service name="deleteWorkEffort" default-entity-name="WorkEffort" engine="simple"
> location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffort">
> @@ -363,6 +364,7 @@ under the License.
> <auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
> <auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequest"/>
> <override name="custRequestId" optional="true" mode="INOUT"/>
> +<override name="description" allow-html="safe"/>
> </service>
> <service name="deleteWorkEffortRequest" engine="simple" location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequest" auth="true">
> <description>Deletes a CustRequestWorkEffort</description>
>
>
>