OFBiz › OFBiz - Commits

svn commit: r590562 - in /ofbiz/trunk/applications/product: webapp/facility/shipment/FindShipment.ftl widget/facility/ShipmentScreens.xml

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
lektran
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r590562 - in /ofbiz/trunk/applications/product: webapp/facility/shipment/FindShipment.ftl widget/facility/ShipmentScreens.xml

lektran
Author: lektran
Date: Tue Oct 30 22:23:59 2007
New Revision: 590562

URL: http://svn.apache.org/viewvc?rev=590562&view=rev
Log:
If the user keys in an invalid shipment id in the Find Shipment screen revert back to Find Shipment, reported by Skip Dever in the user list

Modified:
    ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
    ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=590562&r1=590561&r2=590562&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Tue Oct 30 22:23:59 2007
@@ -55,7 +55,7 @@
               <tr>
                 <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.ProductShipmentId} :</div></td>
                 <td width="5%">&nbsp;</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/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=590562&r1=590561&r2=590562&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Tue Oct 30 22:23:59 2007
@@ -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>


Free forum by Nabble Edit this page