svn commit: r548015 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: jacopoc
Date: Sun Jun 17 00:40:25 2007 New Revision: 548015 URL: http://svn.apache.org/viewvc?view=rev&rev=548015 Log: New common decorators, crud screens and forms for inventory labels and label types. Improved the crud services used by the screens. Added: ofbiz/trunk/applications/product/webapp/facility/labels/ ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml (with props) ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml (with props) Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/trunk/applications/product/servicedef/services_facility.xml ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml ofbiz/trunk/applications/product/widget/facility/Menus.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=548015&r1=548014&r2=548015 ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Sun Jun 17 00:40:25 2007 @@ -681,6 +681,10 @@ ProductInventoryFacility=Inventory Facility ProductInventoryItem=Inventory Item ProductInventoryItemId=Inventory Item Id +ProductInventoryItemLabel=Inventory Item Label +ProductInventoryItemLabelAppl=Label Applicability +ProductInventoryItemLabels=Inventory Item Labels +ProductInventoryItemLabelTypes=Label Types ProductInventoryItemReservations=Inventory Item Reservations ProductInventoryItemType=Inventory Item Type ProductInventoryItemTypeId=InventoryItem Type ID Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?view=diff&rev=548015&r1=548014&r2=548015 ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Sun Jun 17 00:40:25 2007 @@ -811,6 +811,8 @@ <make-value entity-name="InventoryItemLabelAppl" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> + <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/> + <set field="newEntity.inventoryItemLabelTypeId" from-field="inventoryItemLabel.inventoryItemLabelTypeId"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateInventoryItemLabelAppl" short-description="Update an InventoryItemLabel"> Modified: ofbiz/trunk/applications/product/servicedef/services_facility.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_facility.xml?view=diff&rev=548015&r1=548014&r2=548015 ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_facility.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_facility.xml Sun Jun 17 00:40:25 2007 @@ -740,7 +740,9 @@ <description>Update an InventoryItemLabel</description> <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> - <auto-attributes include="nonpk" mode="IN" optional="true"/> + <auto-attributes include="nonpk" mode="IN" optional="true"> + <exclude field-name="inventoryItemLabelTypeId"/> + </auto-attributes> </service> <service name="deleteInventoryItemLabel" default-entity-name="InventoryItemLabel" engine="simple" location="org/ofbiz/product/inventory/InventoryServices.xml" invoke="deleteInventoryItemLabel" auth="true"> @@ -752,7 +754,9 @@ location="org/ofbiz/product/inventory/InventoryServices.xml" invoke="createInventoryItemLabelAppl" auth="true"> <description>Create an InventoryItemLabelAppl</description> <permission-service service-name="facilityGenericPermission" main-action="CREATE"/> - <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"> + <exclude field-name="inventoryItemLabelTypeId"/> <!-- The type is automatically retrieved from the inventoryItemLabel --> + </auto-attributes> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="inventoryItemLabelId" optional="false"/> </service> @@ -761,7 +765,9 @@ <description>Update an InventoryItemLabelAppl</description> <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> - <auto-attributes include="nonpk" mode="IN" optional="true"/> + <auto-attributes include="nonpk" mode="IN" optional="true"> + <exclude field-name="inventoryItemId"/> + </auto-attributes> </service> <service name="deleteInventoryItemLabelAppl" default-entity-name="InventoryItemLabelAppl" engine="simple" location="org/ofbiz/product/inventory/InventoryServices.xml" invoke="deleteInventoryItemLabelAppl" auth="true"> Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diff&rev=548015&r1=548014&r2=548015 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Sun Jun 17 00:40:25 2007 @@ -446,6 +446,77 @@ <response name="error" type="view" value="EditFacilityRoles"/> </request-map> + <!-- ================ Inventory Item Labels Requests ================= --> + <request-map uri="EditInventoryItemLabelTypes"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditInventoryItemLabelTypes"/> + </request-map> + <request-map uri="createInventoryItemLabelType"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="createInventoryItemLabelType"/> + <response name="success" type="view" value="EditInventoryItemLabelTypes"/> + <response name="error" type="view" value="EditInventoryItemLabelTypes"/> + </request-map> + <request-map uri="updateInventoryItemLabelType"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="updateInventoryItemLabelType"/> + <response name="success" type="view" value="EditInventoryItemLabelTypes"/> + <response name="error" type="view" value="EditInventoryItemLabelTypes"/> + </request-map> + <request-map uri="deleteInventoryItemLabelType"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="deleteInventoryItemLabelType"/> + <response name="success" type="view" value="EditInventoryItemLabelTypes"/> + <response name="error" type="view" value="EditInventoryItemLabelTypes"/> + </request-map> + <request-map uri="FindInventoryItemLabels"> + <security https="true" auth="true"/> + <response name="success" type="view" value="FindInventoryItemLabels"/> + </request-map> + <request-map uri="deleteInventoryItemLabel"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="deleteInventoryItemLabel"/> + <response name="success" type="view" value="FindInventoryItemLabels"/> + <response name="error" type="view" value="FindInventoryItemLabels"/> + </request-map> + <request-map uri="EditInventoryItemLabel"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditInventoryItemLabel"/> + </request-map> + <request-map uri="createInventoryItemLabel"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="createInventoryItemLabel"/> + <response name="success" type="view" value="EditInventoryItemLabel"/> + <response name="error" type="view" value="EditInventoryItemLabel"/> + </request-map> + <request-map uri="updateInventoryItemLabel"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="updateInventoryItemLabel"/> + <response name="success" type="view" value="EditInventoryItemLabel"/> + <response name="error" type="view" value="EditInventoryItemLabel"/> + </request-map> + <request-map uri="EditInventoryItemLabelAppls"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditInventoryItemLabelAppls"/> + </request-map> + <request-map uri="createInventoryItemLabelAppl"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="createInventoryItemLabelAppl"/> + <response name="success" type="view" value="EditInventoryItemLabelAppls"/> + <response name="error" type="view" value="EditInventoryItemLabelAppls"/> + </request-map> + <request-map uri="updateInventoryItemLabelAppl"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="updateInventoryItemLabelAppl"/> + <response name="success" type="view" value="EditInventoryItemLabelAppls"/> + <response name="error" type="view" value="EditInventoryItemLabelAppls"/> + </request-map> + <request-map uri="deleteInventoryItemLabelAppl"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="deleteInventoryItemLabelAppl"/> + <response name="success" type="view" value="EditInventoryItemLabelAppls"/> + <response name="error" type="view" value="EditInventoryItemLabelAppls"/> + </request-map> <!-- ================ Inventory Requests ================= --> <request-map uri="EditInventoryItem"> <security https="true" auth="true"/> @@ -1094,6 +1165,11 @@ <view-map name="EditFacilityGroupMembers" type="screen" page="component://product/widget/facility/FacilityGroupScreens.xml#EditFacilityGroupMembers"/> <view-map name="EditFacilityGroupRollup" type="screen" page="component://product/widget/facility/FacilityGroupScreens.xml#EditFacilityGroupRollup"/> <view-map name="EditFacilityGroupRoles" type="screen" page="component://product/widget/facility/FacilityGroupScreens.xml#EditFacilityGroupRoles"/> + + <view-map name="EditInventoryItemLabelTypes" type="screen" page="component://product/widget/facility/InventoryItemLabelScreens.xml#EditInventoryItemLabelTypes"/> + <view-map name="FindInventoryItemLabels" type="screen" page="component://product/widget/facility/InventoryItemLabelScreens.xml#FindInventoryItemLabels"/> + <view-map name="EditInventoryItemLabel" type="screen" page="component://product/widget/facility/InventoryItemLabelScreens.xml#EditInventoryItemLabel"/> + <view-map name="EditInventoryItemLabelAppls" type="screen" page="component://product/widget/facility/InventoryItemLabelScreens.xml#EditInventoryItemLabelAppls"/> <view-map name="PackOrder" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#PackOrder"/> <view-map name="PackingSlip.pdf" type="screenfop" page="component://product/widget/facility/ShipmentScreens.xml#PackingSlip.fo" content-type="application/pdf" encoding="none"/> Modified: ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl?view=diff&rev=548015&r1=548014&r2=548015 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/includes/appheader.ftl Sun Jun 17 00:40:25 2007 @@ -25,6 +25,7 @@ <li<#if selected = "main"> class="selected"</#if>><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.ProductMain}</a></li> <li<#if selected = "facility"> class="selected"</#if>><a href="<@ofbizUrl>FindFacility</@ofbizUrl>">${uiLabelMap.ProductFacilities}</a></li> <li<#if selected = "facilityGroup"> class="selected"</#if>><a href="<@ofbizUrl>FindFacilityGroup</@ofbizUrl>">${uiLabelMap.ProductFacilityGroups}</a></li> + <li<#if selected = "inventoryItemLabel"> class="selected"</#if>><a href="<@ofbizUrl>FindInventoryItemLabels</@ofbizUrl>">${uiLabelMap.ProductInventoryItemLabels}</a></li> <li<#if selected = "shipment"> class="selected"</#if>><a href="<@ofbizUrl>FindShipment</@ofbizUrl>">${uiLabelMap.ProductShipments}</a></li> <#if facilityId?has_content> <li<#if selected = "reports"> class="selected"</#if>><a href="<@ofbizUrl>InventoryReports?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.CommonReports}</a></li> Added: ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml?view=auto&rev=548015 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml (added) +++ ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml Sun Jun 17 00:40:25 2007 @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + <form name="AddInventoryItemLabelType" type="single" target="createInventoryItemLabelType" title=""> + <auto-fields-service service-name="createInventoryItemLabelType"/> + <field name="parentTypeId"> + <drop-down allow-empty="true"> + <entity-options entity-name="InventoryItemLabelType" key-field-name="inventoryItemLabelTypeId" description="${description} [${inventoryItemLabelTypeId}]"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="hasTable"> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> + </form> + <form name="UpdateInventoryItemLabelTypes" type="list" target="updateInventoryItemLabelType" title="" list-name="inventoryItemLabelTypes"> + <auto-fields-service service-name="updateInventoryItemLabelType"/> + <field name="inventoryItemLabelTypeId"><display/></field> + <field name="parentTypeId"> + <drop-down allow-empty="true"> + <entity-options entity-name="InventoryItemLabelType" key-field-name="inventoryItemLabelTypeId" description="${description} [${inventoryItemLabelTypeId}]"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + <field name="deleteLink" title="" widget-style="buttontext"> + <hyperlink target="deleteInventoryItemLabelType?inventoryItemLabelTypeId=${inventoryItemLabelTypeId}" + description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + </field> + </form> + <form name="ListInventoryItemLabels" type="list" title="" list-name="inventoryItemLabels"> + <auto-fields-entity entity-name="InventoryItemLabel" default-field-type="display"/> + <field name="inventoryItemLabelId" widget-style="buttontext"> + <hyperlink target="EditInventoryItemLabel?inventoryItemLabelId=${inventoryItemLabelId}" + description="${inventoryItemLabelId}" also-hidden="true"/> + </field> + <field name="inventoryItemLabelTypeId"> + <display-entity entity-name="InventoryItemLabelType" description="${description} [${inventoryItemLabelTypeId}]" also-hidden="true"/> + </field> + <field name="deleteLink" title="" widget-style="buttontext"> + <hyperlink target="deleteInventoryItemLabel?inventoryItemLabelId=${inventoryItemLabelId}" + description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + </field> + </form> + <form name="EditInventoryItemLabel" type="single" target="createInventoryItemLabel" title="" default-map-name="inventoryItemLabel"> + <alt-target target="updateInventoryItemLabel" use-when="inventoryItemLabel!=null"/> + <auto-fields-service service-name="createInventoryItemLabel" /> + <field name="inventoryItemLabelId" use-when="inventoryItemLabel!=null"><display/></field> + <field name="inventoryItemLabelTypeId" use-when="inventoryItemLabel==null"> + <drop-down allow-empty="false"> + <entity-options entity-name="InventoryItemLabelType" description="${description} [${inventoryItemLabelTypeId}]"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="inventoryItemLabelTypeId" use-when="inventoryItemLabel!=null"> + <display-entity entity-name="InventoryItemLabelType" description="${description} [${inventoryItemLabelTypeId}]" also-hidden="false"/> + </field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> + </form> + <form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelAppl" title="" list-name="inventoryItemLabelAppls"> + <auto-fields-service service-name="updateInventoryItemLabelAppl"/> + <field name="inventoryItemLabelId"><hidden/></field> + <field name="inventoryItemLabelTypeId"><hidden/></field> + <field name="inventoryItemId" widget-style="buttontext"> + <display-entity entity-name="InventoryItem" description="${productId}"> + <sub-hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}" + description="[${inventoryItemId}]"/> + </display-entity> + </field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + <field name="deleteLink" title="" widget-style="buttontext"> + <hyperlink target="deleteInventoryItemLabelAppl?inventoryItemId=${inventoryItemId}&inventoryItemLabelTypeId=${inventoryItemLabelTypeId}&inventoryItemLabelId=${inventoryItemLabelId}" + description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + </field> + </form> + <form name="AddInventoryItemLabelAppl" type="single" target="createInventoryItemLabelAppl" title=""> + <auto-fields-service service-name="createInventoryItemLabelAppl"/> + <field name="inventoryItemLabelId"><hidden/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> + </form> +</forms> Propchange: ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?view=diff&rev=548015&r1=548014&r2=548015 ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Sun Jun 17 00:40:25 2007 @@ -95,6 +95,66 @@ </widgets> </section> </screen> + <screen name="CommonInventoryItemLabelsDecorator"> + <section> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <if-has-permission permission="FACILITY" action="_VIEW"/> + </condition> + <widgets> + <include-menu name="InventoryItemLabelsTabBar" location="component://product/widget/facility/Menus.xml"/> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="head3">${uiLabelMap.ProductFacilityViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="CommonInventoryItemLabelDecorator"> + <section> + <actions> + <set field="inventoryItemLabelId" from-field="parameters.inventoryItemLabelId"/> + <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <if-has-permission permission="FACILITY" action="_VIEW"/> + </condition> + <widgets> + <section> + <condition> + <not><if-empty field-name="inventoryItemLabel"/></not> + </condition> + <widgets> + <include-menu name="InventoryItemLabelsTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="InventoryItemLabelTabBar" location="component://product/widget/facility/Menus.xml"/> + <label style="head1">${uiLabelMap.ProductInventoryItemLabel} [${inventoryItemLabelId}]</label> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="head3">${uiLabelMap.ProductErrorInventoryItemLabelIdNotFound}</label> + </fail-widgets> + </section> + </widgets> + <fail-widgets> + <label style="head3">${uiLabelMap.ProductFacilityViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Added: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml?view=auto&rev=548015 ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml (added) +++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml Sun Jun 17 00:40:25 2007 @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="FindInventoryItemLabels"> + <section> + <actions> + <set field="titleProperty" value="PageTitleFindInventoryItemLabels"/> + <set field="headerItem" value="inventoryItemLabel"/> + <set field="tabButtonItem" value="FindInventoryItemLabels"/> + <entity-condition entity-name="InventoryItemLabel" list-name="inventoryItemLabels"/> + </actions> + <widgets> + <decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}"> + <decorator-section name="body"> + <!--<label style="head1">${uiLabelMap.ProductFacilityGroup}</label>--> + <container> + <link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext"/> + </container> + <include-form name="ListInventoryItemLabels" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditInventoryItemLabelTypes"> + <section> + <actions> + <set field="titleProperty" value="PageTitleFindInventoryItemLabels"/> + <set field="headerItem" value="inventoryItemLabel"/> + <set field="tabButtonItem" value="EditInventoryItemLabelTypes"/> + <entity-condition entity-name="InventoryItemLabelType" list-name="inventoryItemLabelTypes"/> + </actions> + <widgets> + <decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="UpdateInventoryItemLabelTypes" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + <include-form name="AddInventoryItemLabelType" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditInventoryItemLabel"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditFacilityGroup"/> + <set field="headerItem" value="inventoryItemLabel"/> + <set field="tabButtonItem" value="FindInventoryItemLabels"/> + <set field="subTabButtonItem" value="EditInventoryItemLabel"/> + <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/> + </actions> + <widgets> + <section> + <condition> + <not><if-empty field-name="inventoryItemLabel"/></not> + </condition> + <widgets> + <decorator-screen name="CommonInventoryItemLabelDecorator" location="${parameters.commonFacilityDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="EditInventoryItemLabel" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + <fail-widgets> + <decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}"> + <decorator-section name="body"> + <label style="head1">${uiLabelMap.ProductInventoryItemLabel}</label> + <container> + <link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext"/> + </container> + <include-form name="EditInventoryItemLabel" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </decorator-section> + </decorator-screen> + </fail-widgets> + </section> + </widgets> + </section> + </screen> + <screen name="EditInventoryItemLabelAppls"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditInventoryItemLabelAppls"/> + <set field="headerItem" value="inventoryItemLabel"/> + <set field="tabButtonItem" value="FindInventoryItemLabels"/> + <set field="subTabButtonItem" value="EditInventoryItemLabelAppls"/> + <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/> + <get-related value-name="inventoryItemLabel" relation-name="InventoryItemLabelAppl" list-name="inventoryItemLabelAppls"/> + <get-related-one value-name="inventoryItemLabel" relation-name="InventoryItemLabelType" to-value-name="inventoryItemLabelType"/> + </actions> + <widgets> + <decorator-screen name="CommonInventoryItemLabelDecorator" location="${parameters.commonFacilityDecoratorLocation}"> + <decorator-section name="body"> + <container><label style="head2">${uiLabelMap.CommonType}: ${inventoryItemLabelType.description} [${inventoryItemLabelType.inventoryItemLabelTypeId}]</label></container> + <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/labels/InventoryItemLabelForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + +</screens> + Propchange: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?view=diff&rev=548015&r1=548014&r2=548015 ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Sun Jun 17 00:40:25 2007 @@ -77,4 +77,20 @@ <link target="FindShipment?originFacilityId=${facilityId}&lookupFlag=Y"/> </menu-item> </menu> + <menu name="InventoryItemLabelsTabBar" default-menu-item-name="FindInventoryItemLabels"> + <menu-item name="FindInventoryItemLabels" title="${uiLabelMap.ProductInventoryItemLabels}"> + <link target="FindInventoryItemLabels"/> + </menu-item> + <menu-item name="EditInventoryItemLabelTypes" title="${uiLabelMap.ProductInventoryItemLabelTypes}"> + <link target="EditInventoryItemLabelTypes"/> + </menu-item> + </menu> + <menu name="InventoryItemLabelTabBar" default-menu-item-name="EditInventoryItemLabel" selected-menuitem-context-field-name="subTabButtonItem"> + <menu-item name="EditInventoryItemLabel" title="${uiLabelMap.ProductInventoryItemLabel}"> + <link target="EditInventoryItemLabel?inventoryItemLabelId=${inventoryItemLabelId}"/> + </menu-item> + <menu-item name="EditInventoryItemLabelAppls" title="${uiLabelMap.ProductInventoryItemLabelAppl}"> + <link target="EditInventoryItemLabelAppls?inventoryItemLabelId=${inventoryItemLabelId}"/> + </menu-item> + </menu> </menus> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |