svn commit: r778290 - in /ofbiz/branches/release09.04: ./ applications/party/servicedef/services.xml applications/party/webapp/partymgr/communication/CommForms.xml

[hansbak-2]

Author: hansbak
Date: Mon May 25 06:03:25 2009
New Revision: 778290

URL: http://svn.apache.org/viewvc?rev=778290&view=rev
Log:
Applied fix from trunk for revision: 778078
 make sure a input field is empty and have some more service fields set with htmlallow=safe

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/party/servicedef/services.xml
    ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 25 06:03:25 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778278,778280
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778278,778280

Modified: ofbiz/branches/release09.04/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/servicedef/services.xml?rev=778290&r1=778289&r2=778290&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/servicedef/services.xml (original)
+++ ofbiz/branches/release09.04/applications/party/servicedef/services.xml Mon May 25 06:03:25 2009
@@ -673,9 +673,9 @@
         <attribute name="orderId" type="String" mode="IN" optional="true"/>
         <attribute name="custRequestId" type="String" mode="IN" optional="true"/>
         <override name="headerString" allow-html="any"/>
-        <override name="content" allow-html="any"/>
-        <override name="messageId" allow-html="any"/>
-        <override name="subject" allow-html="any"/>
+        <override name="content" allow-html="safe"/>
+        <override name="messageId" allow-html="safe"/>
+        <override name="subject" allow-html="safe"/>
     </service>
     <service name="createCommunicationEvent" engine="simple"
             location="component://party/script/org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="createCommunicationEventWithPermission" auth="true">
@@ -696,7 +696,9 @@
         <auto-attributes entity-name="CommunicationEvent" include="pk" mode="IN" optional="false"/>
         <auto-attributes entity-name="CommunicationEvent" include="nonpk" mode="IN" optional="true"/>
         <attribute name="oldStatusId" type="String" mode="OUT" optional="true"/>
-        <override name="content" allow-html="any"/>
+        <override name="messageId" allow-html="safe"/>
+        <override name="content" allow-html="safe"/>
+        <override name="subject" allow-html="safe"/>
     </service>
     <service name="deleteCommunicationEvent" engine="simple"
         location="component://party/script/org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="deleteCommunicationEvent" auth="true">

Modified: ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml?rev=778290&r1=778289&r2=778290&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml Mon May 25 06:03:25 2009
@@ -732,7 +732,7 @@
         </actions>
         <field name="donePage"><hidden value="${donePage}"/></field>
         <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field>
-        <field name="partyId" tooltip="${uiLabelMap.PartyLeaveEmpty}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyId" entry-name="dummy" tooltip="${uiLabelMap.PartyLeaveEmpty}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="emailAddress"><text/></field>
         <field name="firstName" position="1"><text/></field>
         <field name="middleName" position="2"><text/></field>