Author: jacopoc
Date: Thu Oct 26 22:24:55 2006
New Revision: 468278
URL: http://svn.apache.org/viewvc?view=rev&rev=468278
Log:
Applied patch from Ashish Vijaywargiya (OFBIZ-402) to convert deprecated
string-to-field operations to the set operation.
Modified:
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Modified:
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml?view=diff&rev=468278&r1=468277&r2=468278
==============================================================================
---
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
Thu Oct 26 22:24:55 2006
@@ -78,19 +78,19 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set field="newEntity.facilityId" from-field="parameters.facilityId" />
- <string-to-field
string="${parameters.areaId}${parameters.aisleId}${parameters.sectionId}${parameters.levelId}${parameters.positionId}"
field-name="locationSeqId"/>
+ <set field="locationSeqId"
value="${parameters.areaId}${parameters.aisleId}${parameters.sectionId}${parameters.levelId}${parameters.positionId}"/>
<!-- check to see if it exists already, if so try a simple suffix,
then give up and use a sequenced id -->
<if-not-empty field-name="locationSeqId">
<env-to-field env-name="locationSeqId"
map-name="checkLocationSeqIdMap"/>
<set field="checkLocationSeqIdMap.facilityId"
from-field="parameters.facilityId" />
<find-by-primary-key entity-name="FacilityLocation"
map-name="checkLocationSeqIdMap" value-name="checkLocationSeqIdValue"/>
<if-not-empty field-name="checkLocationSeqIdValue">
- <string-to-field string="${locationSeqId}_2"
field-name="locationSeqId"/>
+ <set field="locationSeqId" value="${locationSeqId}_2" />
<env-to-field env-name="locationSeqId"
map-name="checkLocationSeqIdMap"/>
<set field="checkLocationSeqIdMap.facilityId"
from-field="parameters.facilityId" />
<find-by-primary-key entity-name="FacilityLocation"
map-name="checkLocationSeqIdMap" value-name="checkLocationSeqIdValue"/>
<if-not-empty field-name="checkLocationSeqIdValue">
- <string-to-field string="" field-name="locationSeqId"/>
+ <set field="locationSeqId" value="" />
</if-not-empty>
</if-not-empty>
</if-not-empty>
Modified:
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=468278&r1=468277&r2=468278
==============================================================================
---
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Thu Oct 26 22:24:55 2006
@@ -181,7 +181,7 @@
<set field="titleProperty"
value="PageTitleEditFacilityInventoryItems"/>
<set field="headerItem" value="facility"/>
<set field="tabButtonItem" value="EditFacilityInventoryItems"/>
-
+
<script
location="component://product/webapp/facility/WEB-INF/actions/facility/EditFacilityInventoryItems.bsh"/>
</actions>
<widgets>
