Author: jleroux
Date: Tue Feb 3 23:45:09 2009 New Revision: 740518 URL: http://svn.apache.org/viewvc?rev=740518&view=rev Log: Revert 740004 (and conflicted changes since then resolved) Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml 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=740518&r1=740517&r2=740518&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:45:09 2009 @@ -70,7 +70,7 @@ <to-string field="custRequestId"/> <set from-field="custRequestId" field="newEntity.custRequestId"/> <create-value value-field="newEntity"/> - <field-to-result field="newEntity.custRequestId"/> + <field-to-result field="custRequestId" map-name="newEntity"/> <!-- jacopoc: Commented out the following code because it is too specific and not valid as a general rule: a user may enter the request from a customer even if he will not work Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=740518&r1=740517&r2=740518&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Feb 3 23:45:09 2009 @@ -782,7 +782,7 @@ </call-service> <if-compare field="genericResult.hasPermission" operator="equals" value="false" type="Boolean"> <field-to-result field="genericResult.hasPermission" result-name="hasPermission"/> - <field-to-result field="genericResult.failMessage" result-name="failMessage"/> + <field-to-result field="genericResult.failMessage" map-name="failMessage"/> <return/> </if-compare> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=740518&r1=740517&r2=740518&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Tue Feb 3 23:45:09 2009 @@ -37,7 +37,7 @@ <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> - <field-to-result field="newEntity.fromDate"/> + <field-to-result field="fromDate" map-name="newEntity"/> <create-value value-field="newEntity"/> </simple-method> @@ -80,7 +80,7 @@ <sequenced-id sequence-name="ProductConfigItem" field="newEntity.configItemId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="newEntity.configItemId"/> + <field-to-result field="configItemId" map-name="newEntity"/> </simple-method> <simple-method method-name="updateProductConfigItem" short-description="Update a Config Item"> <check-permission action="_UPDATE" permission="CATALOG"> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=740518&r1=740517&r2=740518&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Feb 3 23:45:09 2009 @@ -383,7 +383,7 @@ <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> - <field-to-result field="newEntity.fromDate"/> + <field-to-result field="fromDate" map-name="newEntity"/> <set field="newEntity.lastModifiedDate" from-field="nowTimestamp" /> <set field="newEntity.createdDate" from-field="nowTimestamp" /> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=740518&r1=740517&r2=740518&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Tue Feb 3 23:45:09 2009 @@ -37,7 +37,7 @@ <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> - <field-to-result field="newEntity.fromDate"/> + <field-to-result field="fromDate" map-name="newEntity"/> <set field="newEntity.lastModifiedDate" from-field="nowTimestamp" /> <set field="newEntity.createdDate" from-field="nowTimestamp" /> @@ -146,7 +146,7 @@ <make-value value-field="newEntity" entity-name="ProductPriceRule"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="ProductPriceRule" field="newEntity.productPriceRuleId"/> - <field-to-result field="newEntity.productPriceRuleId"/> + <field-to-result field="productPriceRuleId" map-name="newEntity"/> <create-value value-field="newEntity"/> </simple-method> @@ -182,7 +182,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-field="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/> - <field-to-result field="newEntity.productPriceCondSeqId"/> + <field-to-result field="productPriceCondSeqId" map-name="newEntity"/> <create-value value-field="newEntity"/> </simple-method> @@ -218,7 +218,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-field="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/> - <field-to-result field="newEntity.productPriceActionSeqId"/> + <field-to-result field="productPriceActionSeqId" map-name="newEntity"/> <create-value value-field="newEntity"/> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=740518&r1=740517&r2=740518&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Tue Feb 3 23:45:09 2009 @@ -29,7 +29,7 @@ <make-value value-field="newEntity" entity-name="ProductPromo"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="ProductPromo" field="newEntity.productPromoId"/> - <field-to-result field="newEntity.productPromoId"/> + <field-to-result field="productPromoId" map-name="newEntity"/> <if-empty field="newEntity.userEntered"> <set value="Y" set-if-empty="true" field="newEntity.userEntered"/> @@ -84,7 +84,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-field="newEntity" seq-field-name="productPromoActionSeqId" numeric-padding="2"/> - <field-to-result field="newEntity.productPromoActionSeqId"/> + <field-to-result field="productPromoActionSeqId" map-name="newEntity"/> <create-value value-field="newEntity"/> </simple-method> @@ -157,7 +157,7 @@ <sequenced-id sequence-name="ProductPromoCode" field="newEntity.productPromoCodeId" stagger-max="100"/> </if-empty> - <field-to-result field="newEntity.productPromoCodeId"/> + <field-to-result field="productPromoCodeId" map-name="newEntity"/> <now-timestamp field="nowTimestamp"/> <if-empty field="newEntity.fromDate"> @@ -253,7 +253,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-field="newEntity" seq-field-name="productPromoCondSeqId" numeric-padding="2"/> - <field-to-result field="newEntity.productPromoCondSeqId"/> + <field-to-result field="productPromoCondSeqId" map-name="newEntity"/> <create-value value-field="newEntity"/> </simple-method> @@ -323,7 +323,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-field="newEntity" seq-field-name="productPromoRuleId" numeric-padding="2"/> - <field-to-result field="newEntity.productPromoRuleId"/> + <field-to-result field="productPromoRuleId" map-name="newEntity"/> <create-value value-field="newEntity"/> </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=740518&r1=740517&r2=740518&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:45:09 2009 @@ -41,7 +41,7 @@ </if-empty> <log level="info" message="Creating a FacilityContactMech with id: ${parameters.contactMechId}"/> <set field="newValue.facilityId" from-field="parameters.facilityId" /> - <field-to-result field="contactMechId" result-name="newValue"/> + <field-to-result field="contactMechId" map-name="newValue"/> <field-to-request field="contactMechId" request-name="newValue"/> <set-nonpk-fields map="parameters" value-field="newValue"/> <now-timestamp field="newValue.fromDate"/> @@ -162,7 +162,7 @@ </call-service> <field-to-request field="contactMechId" request-name="newFacilityContactMech"/> - <field-to-result field="contactMechId" result-name="newFacilityContactMech"/> + <field-to-result field="contactMechId" map-name="newFacilityContactMech"/> </simple-method> <simple-method method-name="updateFacilityPostalAddress" short-description="Update a PostalAddress for facility"> @@ -185,7 +185,7 @@ <default-message>Facility Contact Mechanism successfully updated</default-message> </call-service> <field-to-request field="contactMechId" request-name="newFacilityContactMech"/> - <field-to-result field="contactMechId" result-name="newFacilityContactMech"/> + <field-to-result field="contactMechId" map-name="newFacilityContactMech"/> </simple-method> <simple-method method-name="createFacilityTelecomNumber" short-description="Create a TelecomNumber for facility"> @@ -209,7 +209,7 @@ </call-service> <field-to-request field="contactMechId" request-name="newFacilityContactMech"/> - <field-to-result field="contactMechId" result-name="newFacilityContactMech"/> + <field-to-result field="contactMechId" map-name="newFacilityContactMech"/> </simple-method> <simple-method method-name="updateFacilityTelecomNumber" short-description="Update a TelecomNumber for facility"> @@ -234,7 +234,7 @@ </call-service> <log level="info" message="Setting result id: ${newFacilityContactMech.contactMechId}"/> <field-to-request field="contactMechId" request-name="newFacilityContactMech"/> - <field-to-result field="contactMechId" result-name="newFacilityContactMech"/> + <field-to-result field="contactMechId" map-name="newFacilityContactMech"/> </simple-method> Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=740518&r1=740517&r2=740518&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original) +++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Tue Feb 3 23:45:09 2009 @@ -332,7 +332,7 @@ </simple-method> <simple-method method-name="unlinkInvoiceFromTimeEntry" short-description="Delete TimeEntry"> <entity-one entity-name="TimeEntry" value-field="lookedUpValue"/> - <field-to-result field="invoiceId" result-name="lookedUpValue"/> + <field-to-result field="invoiceId" map-name="lookedUpValue"/> <clear-field field="lookedUpValue.invoiceId"/> <store-value value-field="lookedUpValue"/> </simple-method> |
Free forum by Nabble | Edit this page |