svn commit: r740439 - in /ofbiz/trunk/applications/party/script/org/ofbiz/party/contact: ContactMechServices.xml PartyContactMechServices.xml

Author: jleroux
Date: Tue Feb  3 21:00:04 2009
New Revision: 740439

URL: http://svn.apache.org/viewvc?rev=740439&view=rev
Log:
Temporarliy fix current issue when creating Party Contact Mechs (actually reverted to 739820)

Modified:
    ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=740439&r1=740438&r2=740439&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Feb  3 21:00:04 2009
@@ -30,8 +30,8 @@
         </if-empty>
         <set-nonpk-fields map="parameters" value-field="newValue"/>
         <create-value value-field="newValue"/>
-        <field-to-result field="newValue.contactMechId"/>
-        <field-to-request field="newValue.contactMechId"/>
+        <field-to-result map-name="newValue" field="contactMechId"/>
+        <field-to-request map-name="newValue" field-name="contactMechId"/>
         <log level="info" message="Contact mech created with id ${newValue.contactMechId}"/>    
     </simple-method>
     
@@ -72,14 +72,14 @@
             <set field="context.infoString" from-field="parameters.infoString"/>
             <call-service service-name="createContactMech" in-map-name="context">
                 <default-message resource="PartyUiLabels" property="${successMessageProperty}"/>
-                <result-to-field result-name="contactMechId" field="newValue"/>
+                <result-to-field result-name="contactMechId" map-name="newValue"/>
             </call-service>                                        
-            <field-to-result field="newValue.contactMechId"/>
-            <field-to-request field="newValue.contactMechId"/>
+            <field-to-result map-name="newValue" field="contactMechId"/>
+            <field-to-request map-name="newValue" field-name="contactMechId"/>
             <else>
                 <log level="info" message="Contact mech not changed"/>
-                <field-to-result field="oldValue.contactMechId"/>
-                <field-to-request field="oldValue.contactMechId"/>
+                <field-to-result map-name="oldValue" field="contactMechId"/>
+                <field-to-request map-name="oldValue" field-name="contactMechId"/>
             </else>            
         </if-compare-field>
     </simple-method>
@@ -104,12 +104,12 @@
         <set field="context.contactMechTypeId" value="POSTAL_ADDRESS"/>
         <call-service service-name="createContactMech" in-map-name="context">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
-            <result-to-field result-name="contactMechId" field="newValue"/>
+            <result-to-field result-name="contactMechId" map-name="newValue"/>
         </call-service>
         <set-nonpk-fields map="parameters" value-field="newValue"/>
         <create-value value-field="newValue"/>  
-        <field-to-result field="newValue.contactMechId"/>
-        <field-to-request field="newValue.contactMechId"/>            
+        <field-to-result map-name="newValue" field="contactMechId"/>
+        <field-to-request map-name="newValue" field-name="contactMechId"/>            
     </simple-method>
     
     <simple-method method-name="updatePostalAddress" short-description="Update Contact Mechanism with PostalAddress">
@@ -139,14 +139,14 @@
             <log level="info" message="Postal address need updating"/>
             <call-service service-name="createContactMech" in-map-name="context">
                 <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
-                <result-to-field result-name="contactMechId" field="newValue"/>
+                <result-to-field result-name="contactMechId" map-name="newValue"/>
             </call-service>
             <create-value value-field="newValue"/>
             <else>
                 <set field="context.contactMechId" from-field="parameters.contactMechId"/>
                 <call-service service-name="updateContactMech" in-map-name="context">
                     <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
-                    <result-to-field result-name="contactMechId" field="newValue"/>
+                    <result-to-field result-name="contactMechId" map-name="newValue"/>
                 </call-service>
                 <if-compare-field to-field="newValue.contactMechId" field="oldValue.contactMechId" operator="not-equals">
                     <log level="info" message="Postal address need updating, contact mech changed"/>
@@ -157,9 +157,9 @@
                 </if-compare-field>            
             </else>        
         </if-compare-field>    
-        <field-to-request field="newValue.contactMechId" request-name="contactMechId"/>
-        <field-to-result field="parameters.contactMechId" result-name="oldContactMechId"/>
-        <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
+        <field-to-request map-name="newValue" field-name="contactMechId" request-name="contactMechId"/>
+        <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/>
+        <field-to-result map-name="newValue" field="contactMechId" result-name="contactMechId"/>
     </simple-method>
     
     <simple-method method-name="createTelecomNumber" short-description="Create Contact Mechanism with Telecom Number">
@@ -167,12 +167,12 @@
         <set field="context.contactMechTypeId" value="TELECOM_NUMBER"/>
         <call-service service-name="createContactMech" in-map-name="context">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
-            <result-to-field result-name="contactMechId" field="newValue"/>
+            <result-to-field result-name="contactMechId" map-name="newValue"/>
         </call-service>
         <set-nonpk-fields map="parameters" value-field="newValue"/>
         <create-value value-field="newValue"/>  
-        <field-to-result field="newValue.contactMechId"/>
-        <field-to-request field="newValue.contactMechId"/>            
+        <field-to-result map-name="newValue" field="contactMechId"/>
+        <field-to-request map-name="newValue" field-name="contactMechId"/>            
     </simple-method>
     
     <simple-method method-name="updateTelecomNumber" short-description="Update Contact Mechanism with Telecom Number">
@@ -186,14 +186,14 @@
             <log level="info" message="Telecom number needs updating"/>
             <call-service service-name="createContactMech" in-map-name="context">
                 <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
-                <result-to-field result-name="contactMechId" field="newValue"/>
+                <result-to-field result-name="contactMechId" map-name="newValue"/>
             </call-service>
             <create-value value-field="newValue"/>
             <else>
                 <set field="context.contactMechId" from-field="parameters.contactMechId"/>
                 <call-service service-name="updateContactMech" in-map-name="context">
                     <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
-                    <result-to-field result-name="contactMechId" field="newValue"/>
+                    <result-to-field result-name="contactMechId" map-name="newValue"/>
                 </call-service>
                 <if-compare-field to-field="newValue.contactMechId" field="oldValue.contactMechId" operator="not-equals">
                     <log level="info" message="Telecom Number need updating, contact mech changed"/>
@@ -204,8 +204,8 @@
                 </if-compare-field>            
             </else>        
         </if-compare-field>    
-        <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
-        <field-to-result field="parameters.contactMechId" result-name="oldContactMechId"/>
+        <field-to-result map-name="newValue" field="contactMechId" result-name="contactMechId"/>
+        <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/>
     </simple-method>
     
     <simple-method method-name="createEmailAddress" short-description="Create an email address contact mechanism">
@@ -287,7 +287,7 @@
             <set field="emailParams.contentType" from-field="storeEmail.contentType"/>            
             <set field="emailParams.bodyParameters" from-field="bodyParameters"/>
             <set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/>
-            <map-to-map to-map="emailParams.bodyParameters" map="bodyParameters"/>
+            <map-to-map to-map-name="emailParams.bodyParameters" map-name="bodyParameters"/>
             <set field="emailParams.webSiteId" from-field="webSite.webSiteId"/>
             <call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>
         </if-not-empty>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=740439&r1=740438&r2=740439&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Feb  3 21:00:04 2009
@@ -52,7 +52,7 @@
         <if-empty field="parameters.contactMechId">
             <set-service-fields service-name="createContactMech" map="parameters" to-map="createContactMechMap"/>
             <call-service service-name="createContactMech" in-map-name="createContactMechMap">
-                <result-to-field result-name="contactMechId" field="newValue"/>
+                <result-to-field result-name="contactMechId" map-name="newValue"/>
             </call-service>    
             <log level="info" message="ContactMech created"/>    
             <else>
@@ -61,8 +61,8 @@
         </if-empty>  
         <log level="info" message="Creating a PartyContactMech with id: ${parameters.contactMechId}"/>
         <set field="newValue.partyId" from-field="parameters.partyId"/>
-        <field-to-result field="contactMechId" result-name="newValue"/>
-        <field-to-request field="contactMechId" request-name="newValue"/>
+        <field-to-result field="contactMechId" map-name="newValue"/>
+        <field-to-request field="contactMechId" map-name="newValue"/>
         <set-nonpk-fields map="parameters" value-field="newValue"/>
         <now-timestamp field="newValue.fromDate"/>
         <create-value value-field="newValue"/>
@@ -93,7 +93,7 @@
             <set-service-fields service-name="updateContactMech" map="parameters" to-map="updateContactMechMap"/>
             <call-service service-name="updateContactMech" in-map-name="updateContactMechMap">
                 <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/>
-                <result-to-field result-name="contactMechId" field="newPartyContactMech"/>
+                <result-to-field result-name="contactMechId" map-name="newPartyContactMech"/>
             </call-service>
             <else>
                 <set field="newPartyContactMech.contactMechId" from-field="parameters.newContactMechId"/>
@@ -161,7 +161,7 @@
         <set-service-fields service-name="createPostalAddress" map="parameters" to-map="createPostalAddressMap"/>
         <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
-            <result-to-field result-name="contactMechId" field="newPartyContactMech"/>
+            <result-to-field result-name="contactMechId" map-name="newPartyContactMech"/>
         </call-service>
 
         <check-errors/>
@@ -172,8 +172,8 @@
         <call-service service-name="createPartyContactMech" in-map-name="createPartyContactMechMap" break-on-error="true">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
         </call-service>
-        <field-to-request field="contactMechId" request-name="newPartyContactMech"/>
-        <field-to-result field="contactMechId" result-name="newPartyContactMech"/>
+        <field-to-request field="contactMechId" map-name="newPartyContactMech"/>
+        <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
     </simple-method>
     
     <simple-method method-name="updatePartyPostalAddress" short-description="Update a PostalAddress for party">
@@ -195,8 +195,8 @@
         <call-service service-name="updatePartyContactMech" in-map-name="updatePartyContactMechMap">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
         </call-service>
-        <field-to-request field="contactMechId" request-name="newPartyContactMech"/>
-        <field-to-result field="contactMechId" result-name="newPartyContactMech"/>                      
+        <field-to-request field="contactMechId" map-name="newPartyContactMech"/>
+        <field-to-result field="contactMechId" map-name="newPartyContactMech"/>                      
     </simple-method>
 
     <simple-method method-name="createPartyTelecomNumber" short-description="Create a TelecomNumber for party">
@@ -208,7 +208,7 @@
         <set-service-fields service-name="createTelecomNumber" map="parameters" to-map="createTelecomNumberMap"/>          
         <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
-            <result-to-field result-name="contactMechId" field="newPartyContactMech"/>            
+            <result-to-field result-name="contactMechId" map-name="newPartyContactMech"/>            
         </call-service>
 
         <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="createPartyContactMechMap"/>
@@ -219,8 +219,8 @@
         <call-service service-name="createPartyContactMech" in-map-name="createPartyContactMechMap" break-on-error="true">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
         </call-service>
-        <field-to-request field="contactMechId" request-name="newPartyContactMech"/>
-        <field-to-result field="contactMechId" result-name="newPartyContactMech"/>
+        <field-to-request field="contactMechId" map-name="newPartyContactMech"/>
+        <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
     </simple-method>
     
     <simple-method method-name="updatePartyTelecomNumber" short-description="Update a TelecomNumber for party">
@@ -244,8 +244,8 @@
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
         </call-service>
         <log level="info" message="Setting result id: ${newPartyContactMech.contactMechId}"/>
-        <field-to-request field="contactMechId" request-name="newPartyContactMech"/>
-        <field-to-result field="contactMechId" result-name="newPartyContactMech"/>                      
+        <field-to-request field="contactMechId" map-name="newPartyContactMech"/>
+        <field-to-result field="contactMechId" map-name="newPartyContactMech"/>                      
     </simple-method>  
     
     <simple-method method-name="createPartyEmailAddress" short-description="Create an email address for party">
@@ -286,7 +286,7 @@
             <result-to-result result-name="contactMechId"/>
             <result-to-request result-name="contactMechId"/>
         </call-service>
-        <field-to-result field="parameters.contactMechId" result-name="oldContactMechId"/>        
+        <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/>        
     </simple-method>
 
     <simple-method method-name="findPartyFromEmailAddress" short-description="Find partyId from email address">