You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/02/04 01:15:46 UTC
svn commit: r740529 - in /ofbiz/trunk/applications:
party/script/org/ofbiz/party/contact/ party/script/org/ofbiz/party/user/
product/script/org/ofbiz/product/storage/
workeffort/script/org/ofbiz/workeffort/workeffort/
Author: jleroux
Date: Wed Feb 4 00:15:46 2009
New Revision: 740529
URL: http://svn.apache.org/viewvc?rev=740529&view=rev
Log:
Revert 740011 (and conflicted changes since then resolved)
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.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/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=740529&r1=740528&r2=740529&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 Wed Feb 4 00:15:46 2009
@@ -61,7 +61,7 @@
</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" map-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
<field-to-request field="contactMechId" map-name="newValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<now-timestamp field="newValue.fromDate"/>
@@ -173,7 +173,7 @@
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
</call-service>
<field-to-request field="contactMechId" map-name="newPartyContactMech"/>
- <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-result field="contactMechId" result-name="newPartyContactMech"/>
</simple-method>
<simple-method method-name="updatePartyPostalAddress" short-description="Update a PostalAddress for party">
@@ -196,7 +196,7 @@
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
</call-service>
<field-to-request field="contactMechId" map-name="newPartyContactMech"/>
- <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-result field="contactMechId" result-name="newPartyContactMech"/>
</simple-method>
<simple-method method-name="createPartyTelecomNumber" short-description="Create a TelecomNumber for party">
@@ -220,7 +220,7 @@
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
</call-service>
<field-to-request field="contactMechId" map-name="newPartyContactMech"/>
- <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-result field="contactMechId" result-name="newPartyContactMech"/>
</simple-method>
<simple-method method-name="updatePartyTelecomNumber" short-description="Update a TelecomNumber for party">
@@ -245,7 +245,7 @@
</call-service>
<log level="info" message="Setting result id: ${newPartyContactMech.contactMechId}"/>
<field-to-request field="contactMechId" map-name="newPartyContactMech"/>
- <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-result field="contactMechId" result-name="newPartyContactMech"/>
</simple-method>
<simple-method method-name="createPartyEmailAddress" short-description="Create an email address for party">
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=740529&r1=740528&r2=740529&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 Wed Feb 4 00:15:46 2009
@@ -293,11 +293,7 @@
<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... -->
@@ -333,11 +329,7 @@
<!-- 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 -->
@@ -352,11 +344,7 @@
<!-- 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" />
@@ -366,11 +354,7 @@
<!-- 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" />
@@ -380,11 +364,7 @@
<!-- 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" />
@@ -394,11 +374,7 @@
<!-- 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" />
@@ -408,11 +384,7 @@
<!-- 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/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=740529&r1=740528&r2=740529&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 Wed Feb 4 00:15:46 2009
@@ -42,7 +42,7 @@
<log level="info" message="Creating a FacilityContactMech with id: ${parameters.contactMechId}"/>
<set field="newValue.facilityId" from-field="parameters.facilityId" />
<field-to-result field="contactMechId" map-name="newValue"/>
- <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-request field="contactMechId" map-name="newValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<now-timestamp field="newValue.fromDate"/>
@@ -161,7 +161,7 @@
<default-message>Facility Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field="contactMechId" request-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
<field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
@@ -184,7 +184,7 @@
<call-service service-name="updateFacilityContactMech" in-map-name="updateFacilityContactMechMap">
<default-message>Facility Contact Mechanism successfully updated</default-message>
</call-service>
- <field-to-request field="contactMechId" request-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
<field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
@@ -208,7 +208,7 @@
<default-message>Facility Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field="contactMechId" request-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
<field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
@@ -233,7 +233,7 @@
<default-message>Facility Contact Mechanism successfully updated</default-message>
</call-service>
<log level="info" message="Setting result id: ${newFacilityContactMech.contactMechId}"/>
- <field-to-request field="contactMechId" request-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
<field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
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=740529&r1=740528&r2=740529&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 Wed Feb 4 00:15:46 2009
@@ -342,7 +342,7 @@
<set from-field="parameters.workEffortId" field="newValue.workEffortId"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<field-to-result field="contactMechId" result-name="newValue"/>
- <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-request field="contactMechId" map-name="newValue"/>
<create-value value-field="newValue"/>
</simple-method>
@@ -380,7 +380,7 @@
</if-compare-field>
<field-to-result field="contactMechId" result-name="newWorkEffortContactMech"/>
- <field-to-request field="contactMechId" request-name="newWorkEffortContactMech"/>
+ <field-to-request field="contactMechId" map-name="newWorkEffortContactMech"/>
</simple-method>
<simple-method method-name="deleteWorkEffortContactMech" short-description="Delete a WorkEffortContactMech">
@@ -421,7 +421,7 @@
<call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech">
<default-message>WorkEffort Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-request field="contactMechId" map-name="newValue"/>
<field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
@@ -441,7 +441,7 @@
<call-service in-map-name="context2" service-name="updateWorkEffortContactMech">
<default-message>WorkEffort Contact Mechanism successfully updated</default-message>
</call-service>
- <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-request field="contactMechId" map-name="newValue"/>
<field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
@@ -472,7 +472,7 @@
<call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech">
<default-message>WorkEffort Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-request field="contactMechId" map-name="newValue"/>
<field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
@@ -494,7 +494,7 @@
<default-message>Party Contact Mechanism successfully updated</default-message>
</call-service>
<log level="info" message="Setting result id: ${newValue.contactMechId}"/>
- <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-request field="contactMechId" map-name="newValue"/>
<field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>