svn commit: r683894 - in /ofbiz/trunk/applications/product: script/org/ofbiz/product/feature/ProductFeatureServices.xml servicedef/services_feature.xml

[mor-2]

Author: mor
Date: Fri Aug  8 00:46:20 2008
New Revision: 683894

URL: http://svn.apache.org/viewvc?rev=683894&view=rev
Log:
Added productFeatureId as an optional attribute to createProductFeature service to facilitate user entered features

Modified:
    ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
    ofbiz/trunk/applications/product/servicedef/services_feature.xml

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=683894&r1=683893&r2=683894&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 Fri Aug  8 00:46:20 2008
@@ -47,8 +47,12 @@
         
         <make-value value-name="newEntity" entity-name="ProductFeature"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
-        
-        <sequenced-id-to-env sequence-name="ProductFeature" env-name="newEntity.productFeatureId"/>
+        <if-empty field="parameters.productFeatureId">
+            <sequenced-id-to-env sequence-name="ProductFeature" env-name="newEntity.productFeatureId"/>
+        <else>
+            <set field="newEntity.productFeatureId" from-field="parameters.productFeatureId"/>
+        </else>    
+        </if-empty>
         <field-to-result field-name="newEntity.productFeatureId" result-name="productFeatureId"/>
         
         <create-value value-name="newEntity"/>

Modified: ofbiz/trunk/applications/product/servicedef/services_feature.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_feature.xml?rev=683894&r1=683893&r2=683894&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_feature.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_feature.xml Fri Aug  8 00:46:20 2008
@@ -49,6 +49,7 @@
         <attribute name="uomId" type="String" mode="IN" optional="true"/>
         <attribute name="numberSpecified" type="Double" mode="IN" optional="true"/>
         <attribute name="defaultAmount" type="Double" mode="IN" optional="true"/>
+        <attribute name="productFeatureId" type="String" mode="IN" optional="true"/>
         <attribute name="productFeatureId" type="String" mode="OUT" optional="false"/>
         <attribute name="defaultSequenceNum" type="Long" mode="IN" optional="true"/>
         <attribute name="idCode" type="String" mode="IN" optional="true"/>