Author: jacopoc Date: Wed Mar 26 07:29:55 2014 New Revision: 1581712 URL: http://svn.apache.org/r1581712 Log: Redirected the "Create Bom" link, and removed the unnecessary/duplicated screen that was linked to it, to the "Edit Product BOM" screen. This fixes OFBIZ-5483 (thanks to Christian Carlow for the report).
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1581712&r1=1581711&r2=1581712&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Wed Mar 26 07:29:55 2014 @@ -385,16 +385,6 @@ under the License. <security https="true" auth="true"/> <response name="success" type="view" value="FindBom"/> </request-map> - <request-map uri="CreateProductBom"> - <security https="true" auth="true"/> - <response name="success" type="view" value="CreateProductBom"/> - </request-map> - <request-map uri="createProductBom"> - <security https="true" auth="true"/> - <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml" invoke="createBOMAssoc"/> - <response name="success" type="view" value="EditProductBom"/> - <response name="error" type="view" value="CreateProductBom"/> - </request-map> <request-map uri="EditProductManufacturingRules"> <security https="true" auth="true"/> @@ -797,7 +787,6 @@ under the License. <view-map name="EditProductManufacturingRules" page="component://manufacturing/widget/manufacturing/BomScreens.xml#EditProductManufacturingRules" type="screen"/> <view-map name="BomSimulation" page="component://manufacturing/widget/manufacturing/BomScreens.xml#BomSimulation" type="screen"/> <view-map name="FindBom" page="component://manufacturing/widget/manufacturing/BomScreens.xml#FindBom" type="screen"/> - <view-map name="CreateProductBom" page="component://manufacturing/widget/manufacturing/BomScreens.xml#CreateProductBom" type="screen"/> <!-- Costs view mappings --> <view-map name="EditCostCalcs" page="component://manufacturing/widget/manufacturing/CostScreens.xml#EditCostCalcs" type="screen"/> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml?rev=1581712&r1=1581711&r2=1581712&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml Wed Mar 26 07:29:55 2014 @@ -152,20 +152,4 @@ under the License. <display-entity entity-name="ProductAssocType" key-field-name="productAssocTypeId" description="${description}"/> </field> </form> - <form name="CreateProductBom" target="createProductBom" title="" type="single" - header-row-style="header-row" default-table-style="basic-table"> - <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" size="16"/></field> - <field name="productIdTo" title="${uiLabelMap.ProductProductIdTo}"><lookup target-form-name="LookupProduct" size="16"/></field> - <field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}"> - <drop-down> - <option key="MANUF_COMPONENT" description="${uiLabelMap.ManufacturingBillOfMaterials}"/> - <option key="ENGINEER_COMPONENT" description="${uiLabelMap.ManufacturingEngineeringBillOfMaterials}"/> - </drop-down> - </field> - <field name="quantity" title="${uiLabelMap.ManufacturingQuantity}"><text size="6"/></field> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}"> - <submit button-type="button"/> - </field> - </form> </forms> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=1581712&r1=1581711&r2=1581712&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Wed Mar 26 07:29:55 2014 @@ -143,7 +143,7 @@ under the License. <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> - <container style="button-bar"><link target="CreateProductBom" text="${uiLabelMap.ManufacturingCreateBom}" style="buttontext"/></container> + <container style="button-bar"><link target="EditProductBom" text="${uiLabelMap.ManufacturingCreateBom}" style="buttontext"/></container> </decorator-section> <decorator-section name="search-options"> <include-form name="findBom" location="component://manufacturing/widget/manufacturing/BomForms.xml"/> @@ -157,21 +157,4 @@ under the License. </widgets> </section> </screen> - <screen name="CreateProductBom"> - <section> - <actions> - <set field="titleProperty" value="ManufacturingCreateProductBom"/> - <set field="headerItem" value="bom"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.ManufacturingCreateProductBom}"> - <include-form name="CreateProductBom" location="component://manufacturing/widget/manufacturing/BomForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens>