Author: jleroux
Date: Tue Feb 3 23:59:15 2009 New Revision: 740524 URL: http://svn.apache.org/viewvc?rev=740524&view=rev Log: Revert 740009 (and conflicted changes since then resolved) Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Feb 3 23:59:15 2009 @@ -289,7 +289,7 @@ <set from-field="newUserLogin.currentPassword" field="personUserLoginContext.currentPasswordVerify"/> <!-- the above copy is okay since we checked already that they are the same --> <call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext"> - <result-to-field result-name="partyId" field="tempMap"/> + <result-to-field result-name="partyId" map-name="tempMap"/> <result-to-field field="createdUserLogin" result-name="newUserLogin"/> </call-service> <set-current-user-login value-field="createdUserLogin"/> @@ -314,7 +314,7 @@ <!-- address not used, do nothing --> <else> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="contactMechId" field="addressPurposeContext"/> + <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="addressPurposeContext.partyId"/> <!-- create the shipping location --> @@ -329,7 +329,7 @@ <!-- home phone --> <if-not-empty field="parameters.CUSTOMER_HOME_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext"> - <result-to-field result-name="contactMechId" field="homePhonePurposeContext"/> + <result-to-field result-name="contactMechId" map-name="homePhonePurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="homePhonePurposeContext.partyId"/> <set value="PHONE_HOME" field="homePhonePurposeContext.contactMechPurposeTypeId"/> @@ -341,7 +341,7 @@ <!-- work phone --> <if-not-empty field="parameters.CUSTOMER_WORK_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext"> - <result-to-field result-name="contactMechId" field="workPhonePurposeContext"/> + <result-to-field result-name="contactMechId" map-name="workPhonePurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="workPhonePurposeContext.partyId"/> <set value="PHONE_WORK" field="workPhonePurposeContext.contactMechPurposeTypeId"/> @@ -351,7 +351,7 @@ <!-- fax phone --> <if-not-empty field="parameters.CUSTOMER_FAX_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext"> - <result-to-field result-name="contactMechId" field="faxPhonePurposeContext"/> + <result-to-field result-name="contactMechId" map-name="faxPhonePurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="faxPhonePurposeContext.partyId"/> <set value="FAX_NUMBER" field="faxPhonePurposeContext.contactMechPurposeTypeId"/> @@ -361,7 +361,7 @@ <!-- mobile phone --> <if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext"> - <result-to-field result-name="contactMechId" field="mobilePhonePurposeContext"/> + <result-to-field result-name="contactMechId" map-name="mobilePhonePurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="mobilePhonePurposeContext.partyId"/> <set value="PHONE_MOBILE" field="mobilePhonePurposeContext.contactMechPurposeTypeId"/> @@ -371,7 +371,7 @@ <!-- email address --> <if-not-empty field="emailContext.emailAddress"> <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> - <result-to-field result-name="contactMechId" field="emailPurposeContext"/> + <result-to-field result-name="contactMechId" map-name="emailPurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="emailPurposeContext.partyId"/> <set value="PRIMARY_EMAIL" field="emailPurposeContext.contactMechPurposeTypeId"/> @@ -671,7 +671,7 @@ <!-- call the create person service --> <call-service service-name="createPerson" in-map-name="personMap"> - <result-to-field result-name="partyId" field="tempMap"/> + <result-to-field result-name="partyId" map-name="tempMap"/> <result-to-request result-name="partyId"/> </call-service> @@ -761,13 +761,13 @@ <call-service service-name="updatePartyPostalAddress" in-map-name="addressContext"> <!-- this is needed for the "anonymous" checkout process, will be used as the shipping address --> <result-to-request result-name="contactMechId"/> - <result-to-field result-name="contactMechId" field="addressContext"/> + <result-to-field result-name="contactMechId" map-name="addressContext"/> </call-service> <else> <set field="addressContext.partyId" from-field="partyId"/> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="contactMechId" field="addressContext"/> - <result-to-field result-name="contactMechId" field="addressPurposeContext"/> + <result-to-field result-name="contactMechId" map-name="addressContext"/> + <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> <result-to-request result-name="contactMechId"/> </call-service> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml Tue Feb 3 23:59:15 2009 @@ -55,7 +55,7 @@ processor-name="newAffilPostal" in-map-name="parameters" out-map-name="pa_context"/> <check-errors/> <call-service service-name="createPostalAddress" in-map-name="pa_context"> - <result-to-field result-name="parameters.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="parameters"/> </call-service> <!-- Create the Postal Address Purpose --> @@ -69,7 +69,7 @@ processor-name="newAffilPhone" in-map-name="parameters" out-map-name="ph_context"/> <check-errors/> <call-service service-name="createTelecomNumber" in-map-name="ph_context"> - <result-to-field result-name="parameters.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="parameters"/> </call-service> <!-- Create the Phone ContactMech Purpose --> @@ -85,7 +85,7 @@ <if-not-empty field="fax_context.contactNumber"> <call-service service-name="createTelecomNumber" in-map-name="fax_context"> - <result-to-field result-name="parameters.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="parameters"/> </call-service> </if-not-empty> @@ -102,7 +102,7 @@ processor-name="newAffilEmail" in-map-name="parameters" out-map-name="em_context"/> <check-errors/> <call-service service-name="createEmailAddress" in-map-name="em_context"> - <result-to-field result-name="parameters.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="parameters"/> </call-service> <!-- Create the Email ContactMech Purpose --> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Tue Feb 3 23:59:15 2009 @@ -206,7 +206,7 @@ <if-compare field="parameters.useAddress" operator="equals" value="true"> <set from-field="partyId" field="addressContext.partyId"/> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="addressPurposeContext.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> <result-to-request result-name="contactMechId"/> </call-service> <set from-field="tempMap.partyId" field="addressPurposeContext.partyId"/> @@ -229,7 +229,7 @@ <!-- call the create person service --> <call-service service-name="createPerson" in-map-name="personMap"> - <result-to-field result-name="tempMap.partyId"/> + <result-to-field result-name="partyId" map-name="tempMap"/> <result-to-request result-name="partyId"/> </call-service> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Tue Feb 3 23:59:15 2009 @@ -252,7 +252,7 @@ <set from-field="parameters.custRequestId" field="newEntity.custRequestId"/> <set from-field="parameters.noteInfo" field="newNoteMap.note"/> <call-service service-name="createNote" in-map-name="newNoteMap"> - <result-to-field result-name="newEntity.noteId"/> + <result-to-field result-name="noteId" map-name="newEntity"/> </call-service> <create-value value-field="newEntity"/> <field-to-result field="newEntity.noteId" result-name="noteId"/> @@ -271,7 +271,7 @@ <set from-field="parameters.custRequestItemSeqId" field="newEntity.custRequestItemSeqId"/> <set from-field="parameters.note" field="newNoteMap.note"/> <call-service service-name="createNote" in-map-name="newNoteMap"> - <result-to-field result-name="newEntity.noteId"/> + <result-to-field result-name="noteId" map-name="newEntity"/> </call-service> <create-value value-field="newEntity"/> <field-to-result field="newEntity.noteId" result-name="noteId"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Tue Feb 3 23:59:15 2009 @@ -260,7 +260,7 @@ <set field="personUserLoginContext.currentPasswordVerify" from-field="newUserLogin.currentPassword" /> <!-- the above copy is okay since we checked already that they are the same --> <call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext"> - <result-to-field result-name="tempMap.partyId"/> + <result-to-field result-name="partyId" map-name="tempMap"/> <result-to-field field="createdUserLogin" result-name="newUserLogin"/> </call-service> <set-current-user-login value-field="createdUserLogin"/> @@ -285,7 +285,7 @@ <!-- address not used, do nothing --> <else> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="addressPurposeContext.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> </call-service> <set field="addressPurposeContext.partyId" from-field="tempMap.partyId" /> <!-- create the shipping location --> @@ -300,7 +300,7 @@ <!-- home phone --> <if-not-empty field="parameters.CUSTOMER_HOME_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext"> - <result-to-field result-name="homePhonePurposeContext.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="homePhonePurposeContext"/> </call-service> <set field="homePhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="homePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_HOME" /> @@ -310,7 +310,7 @@ <!-- work phone --> <if-not-empty field="parameters.CUSTOMER_WORK_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext"> - <result-to-field result-name="workPhonePurposeContext.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="workPhonePurposeContext"/> </call-service> <set field="workPhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="workPhonePurposeContext.contactMechPurposeTypeId" value="PHONE_WORK" /> @@ -320,7 +320,7 @@ <!-- fax phone --> <if-not-empty field="parameters.CUSTOMER_FAX_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext"> - <result-to-field result-name="faxPhonePurposeContext.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="faxPhonePurposeContext"/> </call-service> <set field="faxPhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="faxPhonePurposeContext.contactMechPurposeTypeId" value="FAX_NUMBER" /> @@ -330,7 +330,7 @@ <!-- mobile phone --> <if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext"> - <result-to-field result-name="mobilePhonePurposeContext.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="mobilePhonePurposeContext"/> </call-service> <set field="mobilePhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="mobilePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_MOBILE" /> @@ -339,7 +339,7 @@ <!-- email address --> <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> - <result-to-field result-name="emailPurposeContext.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="emailPurposeContext"/> </call-service> <set field="emailPurposeContext.partyId" from-field="tempMap.partyId" /> <set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" /> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml Tue Feb 3 23:59:15 2009 @@ -77,7 +77,7 @@ <set-service-fields service-name="createPerson" map-name="parameters" to-map-name="createPersonCtx"/> <call-service service-name="createPerson" in-map-name="createPersonCtx"> - <result-to-field result-name="createUlInMap.partyId"/> + <result-to-field result-name="partyId" map-name="createUlInMap"/> </call-service> <!-- call the service with the system account to get around security constraints for this special create --> @@ -186,7 +186,7 @@ <set field="postalAddressContext.partyId" from-field="partyId"/> <set field="postalAddressContext.contactMechPurposeTypeId" value="GENERAL_LOCATION"/> <call-service service-name="createPartyPostalAddress" in-map-name="postalAddressContext"> - <result-to-field result-name="postalAddressContext.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="postalAddressContext"/> </call-service> <if-not-empty field="postalAddContactMechPurpTypeId"> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Feb 3 23:59:15 2009 @@ -293,7 +293,11 @@ <check-errors/> <call-service service-name="createPerson" in-map-name="personContext"> +<<<<<<< .courant <result-to-field result-name="tempMap.partyId"/> +======= + <result-to-field result-name="partyId" map-name="tempMap"/> +>>>>>>> .fusion-droit.r740008 </call-service> <!-- now that we have the partyId, put it where it needs to go... --> @@ -329,7 +333,11 @@ <!-- address not used, do nothing --> <else> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> +<<<<<<< .courant <result-to-field result-name="addressPurposeContext.contactMechId"/> +======= + <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> +>>>>>>> .fusion-droit.r740008 </call-service> <set field="addressPurposeContext.partyId" from-field="tempMap.partyId" /> <!-- create the shipping location --> @@ -344,7 +352,11 @@ <!-- home phone --> <if-not-empty field="parameters.USER_HOME_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext"> +<<<<<<< .courant <result-to-field result-name="homePhonePurposeContext.contactMechId"/> +======= + <result-to-field result-name="contactMechId" map-name="homePhonePurposeContext"/> +>>>>>>> .fusion-droit.r740008 </call-service> <set field="homePhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="homePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_HOME" /> @@ -354,7 +366,11 @@ <!-- work phone --> <if-not-empty field="parameters.USER_WORK_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext"> +<<<<<<< .courant <result-to-field result-name="workPhonePurposeContext.contactMechId"/> +======= + <result-to-field result-name="contactMechId" map-name="workPhonePurposeContext"/> +>>>>>>> .fusion-droit.r740008 </call-service> <set field="workPhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="workPhonePurposeContext.contactMechPurposeTypeId" value="PHONE_WORK" /> @@ -364,7 +380,11 @@ <!-- fax phone --> <if-not-empty field="parameters.USER_FAX_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext"> +<<<<<<< .courant <result-to-field result-name="faxPhonePurposeContext.contactMechId"/> +======= + <result-to-field result-name="contactMechId" map-name="faxPhonePurposeContext"/> +>>>>>>> .fusion-droit.r740008 </call-service> <set field="faxPhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="faxPhonePurposeContext.contactMechPurposeTypeId" value="FAX_NUMBER" /> @@ -374,7 +394,11 @@ <!-- mobile phone --> <if-not-empty field="parameters.USER_MOBILE_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext"> +<<<<<<< .courant <result-to-field result-name="mobilePhonePurposeContext.contactMechId"/> +======= + <result-to-field result-name="contactMechId" map-name="mobilePhonePurposeContext"/> +>>>>>>> .fusion-droit.r740008 </call-service> <set field="mobilePhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="mobilePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_MOBILE" /> @@ -384,7 +408,11 @@ <!-- email address --> <if-not-empty field="parameters.USER_EMAIL"> <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> +<<<<<<< .courant <result-to-field result-name="emailPurposeContext.contactMechId"/> +======= + <result-to-field result-name="contactMechId" map-name="emailPurposeContext"/> +>>>>>>> .fusion-droit.r740008 </call-service> <set field="emailPurposeContext.partyId" from-field="tempMap.partyId" /> <set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" /> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Tue Feb 3 23:59:15 2009 @@ -94,7 +94,7 @@ <set-service-fields service-name="createProductContent" map="parameters" to-map="createProductContentMap"/> <set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/> <call-service service-name="createSimpleTextContent" in-map-name="createSimpleTextMap"> - <result-to-field result-name="createProductContentMap.contentId"/> + <result-to-field result-name="contentId" map-name="createProductContentMap"/> </call-service> <call-service service-name="createProductContent" in-map-name="createProductContentMap"/> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Tue Feb 3 23:59:15 2009 @@ -32,7 +32,7 @@ <set field="createContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId" /> <call-service service-name="createContactMech" in-map-name="createContactMechMap"> <default-message>Contact Mechanism successfully created.</default-message> - <result-to-field result-name="newValue.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newValue"/> </call-service> <log level="info" message="ContactMech created"/> <else> @@ -77,7 +77,7 @@ <call-service service-name="updateContactMech" in-map-name="updateContactMechMap"> <default-message>Contact Mechanism successfully updated.</default-message> - <result-to-field result-name="newFacilityContactMech.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newFacilityContactMech"/> </call-service> <else> <set field="newFacilityContactMech.contactMechId" from-field="parameters.newContactMechId"/> @@ -149,7 +149,7 @@ <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress"> <default-message>Postal Address successfully created</default-message> - <result-to-field result-name="newFacilityContactMech.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newFacilityContactMech"/> </call-service> <check-errors/> @@ -197,7 +197,7 @@ <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber"> <default-message>Telecom number successfully created</default-message> - <result-to-field result-name="newFacilityContactMech.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newFacilityContactMech"/> </call-service> <set-service-fields service-name="createFacilityContactMech" map="parameters" to-map="createFacilityContactMechMap"/> Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=740524&r1=740523&r2=740524&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Feb 3 23:59:15 2009 @@ -322,14 +322,14 @@ <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="context"/> <call-service service-name="createPartyContactMech" in-map-name="context"> <default-message>Party Contact Mechanism successfully created.</default-message> - <result-to-field result-name="newValue.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newValue"/> </call-service> <log level="info" message="Party ContactMech created"/> <else> <set-service-fields service-name="createContactMech" map="parameters" to-map="context"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message>Contact Mechanism successfully created.</default-message> - <result-to-field result-name="newValue.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newValue"/> </call-service> <log level="info" message="ContactMech created"/> </else> @@ -366,7 +366,7 @@ <log level="info" message="Calling generic updateContactMech method"/> <call-service service-name="updateContactMech" in-map-name="context"> <default-message>Contact Mechanism successfully updated.</default-message> - <result-to-field result-name="newWorkEffortContactMech.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newWorkEffortContactMech"/> </call-service> <else> <set from-field="parameters.newContactMechId" field="newWorkEffortContactMech.contactMechId"/> @@ -401,7 +401,7 @@ processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/> <call-service service-name="createPartyPostalAddress" in-map-name="context"> <default-message>Party Contact Mechanism successfully created.</default-message> - <result-to-field result-name="newValue.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newValue"/> </call-service> <log level="info" message="Party ContactMech created"/> <else> @@ -409,7 +409,7 @@ processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/> <call-service in-map-name="context" service-name="createPostalAddress"> <default-message>Postal Address successfully created</default-message> - <result-to-field result-name="newValue.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newValue"/> </call-service> </else> </if-not-empty> @@ -453,7 +453,7 @@ processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/> <call-service service-name="createPartyTelecomNumber" in-map-name="context"> <default-message>Party Contact Mechanism successfully created.</default-message> - <result-to-field result-name="newValue.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newValue"/> </call-service> <log level="info" message="Party ContactMech created"/> <else> @@ -461,7 +461,7 @@ processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/> <call-service in-map-name="context" service-name="createTelecomNumber"> <default-message>Telecom number successfully created</default-message> - <result-to-field result-name="newValue.contactMechId"/> + <result-to-field result-name="contactMechId" map-name="newValue"/> </call-service> </else> </if-not-empty> |
Free forum by Nabble | Edit this page |