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 2008/01/14 00:37:32 UTC
svn commit: r611679 - in /ofbiz/branches/release4.0/applications/product:
webapp/facility/shipment/FindShipment.ftl widget/facility/ShipmentScreens.xml
Author: jleroux
Date: Sun Jan 13 15:37:30 2008
New Revision: 611679
URL: http://svn.apache.org/viewvc?rev=611679&view=rev
Log:
Applied fix from trunk for revision: 590562
Modified:
ofbiz/branches/release4.0/applications/product/webapp/facility/shipment/FindShipment.ftl
ofbiz/branches/release4.0/applications/product/widget/facility/ShipmentScreens.xml
Modified: ofbiz/branches/release4.0/applications/product/webapp/facility/shipment/FindShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=611679&r1=611678&r2=611679&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/product/webapp/facility/shipment/FindShipment.ftl (original)
+++ ofbiz/branches/release4.0/applications/product/webapp/facility/shipment/FindShipment.ftl Sun Jan 13 15:37:30 2008
@@ -55,7 +55,7 @@
<tr>
<td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.ProductShipmentId} :</div></td>
<td width="5%"> </td>
- <td><input type="text" class="inputBox" name="shipmentId"></td>
+ <td><input type="text" class="inputBox" name="shipmentId" value="${shipmentId?if_exists}"></td>
</tr>
<tr>
<td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.ProductShipmentType} :</div></td>
Modified: ofbiz/branches/release4.0/applications/product/widget/facility/ShipmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/widget/facility/ShipmentScreens.xml?rev=611679&r1=611678&r2=611679&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/product/widget/facility/ShipmentScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/product/widget/facility/ShipmentScreens.xml Sun Jan 13 15:37:30 2008
@@ -81,25 +81,37 @@
<script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonShipmentDecorator">
- <decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://product/webapp/facility/shipment/ViewShipment.ftl"/></html>
- </platform-specific>
- <platform-specific>
- <html><html-template location="component://product/webapp/facility/shipment/ViewShipmentInfo.ftl"/></html>
- </platform-specific>
- <platform-specific>
- <html><html-template location="component://product/webapp/facility/shipment/ViewShipmentItemInfo.ftl"/></html>
- </platform-specific>
- <platform-specific>
- <html><html-template location="component://product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl"/></html>
- </platform-specific>
- <platform-specific>
- <html><html-template location="component://product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl"/></html>
- </platform-specific>
- </decorator-section>
- </decorator-screen>
+ <section>
+ <condition>
+ <not>
+ <if-empty field-name="shipment"/>
+ </not>
+ </condition>
+ <widgets>
+ <decorator-screen name="CommonShipmentDecorator">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://product/webapp/facility/shipment/ViewShipment.ftl"/></html>
+ </platform-specific>
+ <platform-specific>
+ <html><html-template location="component://product/webapp/facility/shipment/ViewShipmentInfo.ftl"/></html>
+ </platform-specific>
+ <platform-specific>
+ <html><html-template location="component://product/webapp/facility/shipment/ViewShipmentItemInfo.ftl"/></html>
+ </platform-specific>
+ <platform-specific>
+ <html><html-template location="component://product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl"/></html>
+ </platform-specific>
+ <platform-specific>
+ <html><html-template location="component://product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ <fail-widgets>
+ <include-screen name="FindShipment"/>
+ </fail-widgets>
+ </section>
</widgets>
</section>
</screen>