svn commit: r740830 - in /ofbiz/trunk/applications: content/script/org/ofbiz/content/layout/LayoutEvents.xml party/script/org/ofbiz/party/contact/ContactMechServices.xml

Author: jleroux
Date: Wed Feb  4 19:11:24 2009
New Revision: 740830

URL: http://svn.apache.org/viewvc?rev=740830&view=rev
Log:
1) <field-to-request map.*="(.*)" field.*="(.*)" request-name="(.*)"/> => <field-to-request field="$1.$2" request-name="$3"/>
then
2) <field-to-request map.*="(.*)" field.*="(.*)"/> =>  <field-to-request field="$1.$2" request-name="$2"/>

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=740830&r1=740829&r2=740830&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Wed Feb  4 19:11:24 2009
@@ -77,14 +77,14 @@
         <set-nonpk-fields map="parameters" value-field="content"/>
         <log level="always" message="content: ${content}"/>
         <store-value value-field="content"/>
-        <field-to-request map-name="content" field-name="contentId" request-name="contentId"/>
+        <field-to-request field="content.contentId" request-name="contentId"/>
         <set field="dataResource.dataResourceId" from-field="parameters.dataResourceId"/>
         <find-by-primary-key entity-name="DataResource" value-field="dataResource" map="dataResource"/>
         <set-nonpk-fields map="parameters" value-field="dataResource"/>
         <set field="dataResource.objectInfo" from-field="parameters.drObjectInfo"/>
         <log level="always" message="dataResource: ${dataResource}"/>
         <store-value value-field="dataResource"/>
-        <field-to-request map-name="dataResource" field-name="dataResourceId" request-name="drDataResourceId"/>
+        <field-to-request field="dataResource.dataResourceId" request-name="drDataResourceId"/>
         <check-errors/>
     </simple-method>
 
@@ -120,7 +120,7 @@
         </call-service>
         <check-errors/>
 
-        <field-to-request map-name="context2" field-name="activeContentId" request-name="contentId"/>
+        <field-to-request field="context2.activeContentId" request-name="contentId"/>
         <field-to-request field="dataResourceId" request-name="drDataResourceId"/>
         <set field="currentEntityName" value="SubContentDataResourceView"/>
         <field-to-request field="currentEntityName" request-name="currentEntityName"/>
@@ -216,7 +216,7 @@
         </call-service>
         <check-errors/>
 
-        <field-to-request map-name="context2" field-name="activeContentId" request-name="contentId"/>
+        <field-to-request field="context2.activeContentId" request-name="contentId"/>
         <field-to-request field="dataResourceId" request-name="drDataResourceId"/>
         <set field="currentEntityName" value="SubContentDataResourceView"/>
         <field-to-request field="currentEntityName" request-name="currentEntityName"/>
@@ -274,7 +274,7 @@
         </call-service>
         <check-errors/>
 
-        <field-to-request map-name="context2" field-name="activeContentId" request-name="contentId"/>
+        <field-to-request field="context2.activeContentId" request-name="contentId"/>
         <field-to-request field="dataResourceId" request-name="drDataResourceId"/>
         <set field="currentEntityName" value="SubContentDataResourceView"/>
         <field-to-request field="currentEntityName" request-name="currentEntityName"/>

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=740830&r1=740829&r2=740830&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 Wed Feb  4 19:11:24 2009
@@ -31,7 +31,7 @@
         <set-nonpk-fields map="parameters" value-field="newValue"/>
         <create-value value-field="newValue"/>
         <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
-        <field-to-request map-name="newValue" field-name="contactMechId"/>
+        <field-to-request field="newValue.contactMechId" request-name="contactMechId"/>
         <log level="info" message="Contact mech created with id ${newValue.contactMechId}"/>    
     </simple-method>
     
@@ -75,11 +75,11 @@
                 <result-to-field result-name="contactMechId" map-name="newValue"/>
             </call-service>                                        
             <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
-            <field-to-request map-name="newValue" field-name="contactMechId"/>
+            <field-to-request field="newValue.contactMechId" request-name="contactMechId"/>
             <else>
                 <log level="info" message="Contact mech not changed"/>
                 <field-to-result field="oldValue.contactMechId" result-name="contactMechId"/>
-                <field-to-request map-name="oldValue" field-name="contactMechId"/>
+                <field-to-request field="oldValue.contactMechId" request-name="contactMechId"/>
             </else>            
         </if-compare-field>
     </simple-method>
@@ -109,7 +109,7 @@
         <set-nonpk-fields map="parameters" value-field="newValue"/>
         <create-value value-field="newValue"/>  
         <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
-        <field-to-request map-name="newValue" field-name="contactMechId"/>            
+        <field-to-request field="newValue.contactMechId" request-name="contactMechId"/>            
     </simple-method>
     
     <simple-method method-name="updatePostalAddress" short-description="Update Contact Mechanism with PostalAddress">
@@ -157,7 +157,7 @@
                 </if-compare-field>            
             </else>        
         </if-compare-field>    
-        <field-to-request map-name="newValue" field-name="contactMechId" request-name="contactMechId"/>
+        <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"/>
     </simple-method>
@@ -172,7 +172,7 @@
         <set-nonpk-fields map="parameters" value-field="newValue"/>
         <create-value value-field="newValue"/>  
         <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
-        <field-to-request map-name="newValue" field-name="contactMechId"/>            
+        <field-to-request field="newValue.contactMechId" request-name="contactMechId"/>            
     </simple-method>
     
     <simple-method method-name="updateTelecomNumber" short-description="Update Contact Mechanism with Telecom Number">