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:22:05 UTC
svn commit: r740530 - in /ofbiz/trunk:
applications/product/script/org/ofbiz/product/category/
applications/product/script/org/ofbiz/product/config/
applications/product/script/org/ofbiz/product/product/
specialpurpose/projectmgr/script/org/ofbiz/project/
Author: jleroux
Date: Wed Feb 4 00:22:04 2009
New Revision: 740530
URL: http://svn.apache.org/viewvc?rev=740530&view=rev
Log:
Revert 740368
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=740530&r1=740529&r2=740530&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Wed Feb 4 00:22:04 2009
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result field="newEntity.contentId"/>
- <field-to-result field="newEntity.productCategoryId"/>
- <field-to-result field="newEntity.prodCatContentTypeId"/>
+ <field-to-result map-name="newEntity" field="contentId"/>
+ <field-to-result map-name="newEntity" field="productCategoryId"/>
+ <field-to-result map-name="newEntity" field="prodCatContentTypeId"/>
</simple-method>
<simple-method method-name="updateCategoryContent" short-description="Update Content For Category">
<make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=740530&r1=740529&r2=740530&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Wed Feb 4 00:22:04 2009
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result field="newEntity.contentId"/>
- <field-to-result field="newEntity.configItemId"/>
- <field-to-result field="newEntity.confItemContentTypeId"/>
+ <field-to-result map-name="newEntity" field="contentId"/>
+ <field-to-result map-name="newEntity" field="configItemId"/>
+ <field-to-result map-name="newEntity" field="confItemContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductConfigItemContent" short-description="Update Content For ProductConfigItem">
<make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
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=740530&r1=740529&r2=740530&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 Wed Feb 4 00:22:04 2009
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result field="newEntity.contentId"/>
- <field-to-result field="newEntity.productId"/>
- <field-to-result field="newEntity.productContentTypeId"/>
+ <field-to-result map-name="newEntity" field="contentId"/>
+ <field-to-result map-name="newEntity" field="productId"/>
+ <field-to-result map-name="newEntity" field="productContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductContent" short-description="Update Content For Product">
<make-value value-field="lookupPKMap" entity-name="ProductContent"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=740530&r1=740529&r2=740530&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Feb 4 00:22:04 2009
@@ -118,7 +118,7 @@
<simple-method method-name="updateTaskAssigment"
short-description="Update task to resource assignment, if required create a new one by re-assigment">
- <field-to-result field="parameters.workEffortId"/>
+ <field-to-result map-name="parameters" field="workEffortId"/>
<if>
<!-- check if a change in partyId Or roletypeId: need to delete and create new -->
<condition>
@@ -239,7 +239,7 @@
2. call a recursive java function to set all the dependant tasks.
-->
- <field-to-result field="parameters.projectId"/>
+ <field-to-result map-name="parameters" field="projectId"/>
<!-- find a starting point being either the estimated start date of a project or the earliest actual start date. -->
<entity-condition entity-name="ProjectAndPhaseAndTask" list="tasks">
@@ -515,7 +515,7 @@
</entity-one>
<if-empty field="project">
- <field-to-result field="parameters.projectId"/>
+ <field-to-result map-name="parameters" field="projectId"/>
<add-error error-list-name="error_list"><fail-message message="Project: ${parameters.projectId} not found"/></add-error>
</if-empty>
<if-not-empty field="parameters.workEffortName">