svn commit: r1761095 - in /ofbiz/trunk: applications/order/widget/orde
Locked
 
|
Author: mbrohl
Date: Fri Sep 16 21:31:05 2016 New Revision: 1761095 URL: http://svn.apache.org/viewvc?rev=1761095&view=rev Log: Improved: Order: Consistent form name. (OFBIZ-8078) Change all form names to upper camel case for consistency. I have slightly modified the patch to remove a typo (LookupOrderHeader instead of LSookupOrderHeader) in LookupScreens.xml. Thanks: Tanmay Muley for reporting and providing the patch. Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1761095&r1=1761094&r2=1761095&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Fri Sep 16 21:31:05 2016 @@ -538,7 +538,7 @@ under the License. </form> <!-- request form --> - <form name="requestInfo" type="single" title="request information" default-map-name="custRequest" + <form name="RequestInfo" type="single" title="request information" default-map-name="custRequest" header-row-style="header-row" default-table-style="basic-table"> <actions> <set field="lookupPartyId" from-field="custRequest.fromPartyId" default-value="_NA_"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1761095&r1=1761094&r2=1761095&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Fri Sep 16 21:31:05 2016 @@ -112,7 +112,7 @@ under the License. <widgets> <container style="lefthalf"> <screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}"> - <include-form name="requestInfo" location="component://order/widget/ordermgr/CustRequestForms.xml"/> + <include-form name="RequestInfo" location="component://order/widget/ordermgr/CustRequestForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.OrderRequestRoles}"> <include-form name="ViewRequestRoles" location="component://order/widget/ordermgr/CustRequestForms.xml"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=1761095&r1=1761094&r2=1761095&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml Fri Sep 16 21:31:05 2016 @@ -21,7 +21,7 @@ under the License. <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="lookupOrderHeader" target="LookupOrderHeader" title="" type="single" + <form name="LookupOrderHeader" target="LookupOrderHeader" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="OrderHeader" default-field-type="find" map-name="parameters"/> <field name="orderHeaderId"><text-find/></field> @@ -60,7 +60,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupOrderHeader" title="" type="list" list-name="listIt" + <form name="ListLookupOrderHeader" title="" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupOrderHeader"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -77,7 +77,7 @@ under the License. <field name="orderTypeId"><display-entity entity-name="OrderType" also-hidden="true"/></field> </form> - <form name="lookupOrderHeaderAndShipInfo" target="LookupOrderHeaderAndShipInfo" title="" type="single" + <form name="LookupOrderHeaderAndShipInfo" target="LookupOrderHeaderAndShipInfo" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="OrderHeaderAndShipGroups" default-field-type="hidden"/> <field name="orderId"><text-find/></field> @@ -117,7 +117,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupOrderHeaderAndShipInfo" list-name="listIt" title="" type="list" + <form name="ListLookupOrderHeaderAndShipInfo" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupOrderHeaderAndShipInfo"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -147,7 +147,7 @@ under the License. <field name="internalName"><display/></field> </form> - <form name="lookupPurchaseOrderHeaderAndShipInfo" target="LookupPurchaseOrderHeaderAndShipInfo" title="" type="single" + <form name="LookupPurchaseOrderHeaderAndShipInfo" target="LookupPurchaseOrderHeaderAndShipInfo" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="OrderHeaderAndShipGroups" default-field-type="hidden" map-name="parameters"/> <field name="orderId"><text-find/></field> @@ -188,7 +188,7 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="lookupCustRequest" target="LookupCustRequest" title="" type="single" + <form name="LookupCustRequest" target="LookupCustRequest" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="CustRequest" default-field-type="hidden"/> <field name="custRequestTypeId"> @@ -233,7 +233,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupCustRequest" list-name="listIt" title="" type="list" + <form name="ListLookupCustRequest" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupCustRequest"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -255,7 +255,7 @@ under the License. <field name="roleTypeId"><display-entity also-hidden="false" entity-name="RoleType"/></field> </form> - <form name="lookupCustRequestItem" target="LookupCustRequestItem" title="" type="single" + <form name="LookupCustRequestItem" target="LookupCustRequestItem" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="CustRequestItem" default-field-type="find"/> <field name="statusId" title="${uiLabelMap.CommonStatus}"> @@ -278,7 +278,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupCustRequestItem" list-name="listIt" title="" type="list" + <form name="ListLookupCustRequestItem" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupCustRequestItem"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -299,7 +299,7 @@ under the License. <field name="statusId"><display-entity also-hidden="false" entity-name="StatusItem"/></field> </form> - <form name="lookupQuote" target="LookupQuote" title="" type="single" + <form name="LookupQuote" target="LookupQuote" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Quote" default-field-type="find"/> <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field> @@ -339,7 +339,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupQuote" list-name="listIt" title="" type="list" + <form name="ListLookupQuote" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupQuote"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -365,7 +365,7 @@ under the License. <field name="validThruDate" title="${uiLabelMap.CommonValidThruDate}"></field> </form> - <form name="lookupQuoteItem" target="LookupQuoteItem" title="" type="single" + <form name="LookupQuoteItem" target="LookupQuoteItem" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="QuoteItem" default-field-type="find"/> <field name="quoteId"><hidden/></field> @@ -406,7 +406,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupQuoteItem" list-name="listIt" title="" type="list" + <form name="ListLookupQuoteItem" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupQuoteItem"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -448,7 +448,7 @@ under the License. <field name="custRequestItemSeqId"><hidden/></field> </form> - <form name="lookupRequirement" target="LookupRequirement" title="" type="single" + <form name="LookupRequirement" target="LookupRequirement" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Requirement" default-field-type="find"/> <field name="requirementId"><text-find/></field> @@ -475,7 +475,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupRequirement" list-name="listIt" title="" type="list" + <form name="ListLookupRequirement" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupRequirement"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -500,7 +500,7 @@ under the License. <field name="quantity" title="${uiLabelMap.CommonQuantity}"><display/></field> </form> - <form name="lookupShoppingList" target="LookupShoppingList" title="" type="single" + <form name="LookupShoppingList" target="LookupShoppingList" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ShoppingList" default-field-type="find"/> <field name="shoppingListId"><text-find/></field> @@ -513,7 +513,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupShoppingList" list-name="listIt" title="" type="list" + <form name="ListLookupShoppingList" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupShoppingList"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=1761095&r1=1761094&r2=1761095&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml Fri Sep 16 21:31:05 2016 @@ -41,10 +41,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupOrderHeader" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="LookupOrderHeader" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupOrderHeader" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="ListLookupOrderHeader" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -70,10 +70,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="LookupOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="ListLookupOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -99,10 +99,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPurchaseOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="LookupPurchaseOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="ListLookupOrderHeaderAndShipInfo" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -127,10 +127,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupCustRequest" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="LookupCustRequest" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupCustRequest" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="ListLookupCustRequest" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -155,10 +155,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupCustRequestItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="LookupCustRequestItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupCustRequestItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="ListLookupCustRequestItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -182,10 +182,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupQuote" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="LookupQuote" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupQuote" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="ListLookupQuote" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -210,10 +210,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupQuoteItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="LookupQuoteItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupQuoteItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="ListLookupQuoteItem" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -237,10 +237,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupRequirement" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="LookupRequirement" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupRequirement" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="ListLookupRequirement" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -264,10 +264,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupShoppingList" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="LookupShoppingList" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupShoppingList" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + <include-form name="ListLookupShoppingList" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml?rev=1761095&r1=1761094&r2=1761095&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/PartySettingsForm.xml Fri Sep 16 21:31:05 2016 @@ -20,7 +20,7 @@ under the License. <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="quickAddOptionalParty" target="addOptionalParty" title="" type="single" + <form name="QuickAddOptionalParty" target="addOptionalParty" title="" type="single" default-title-style="tableheadtext" default-widget-style="inputBox"> <field name="optionalPartyId" title="${uiLabelMap.PartyPartyId}"> <lookup target-form-name="LookupPerson"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml?rev=1761095&r1=1761094&r2=1761095&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml Fri Sep 16 21:31:05 2016 @@ -138,7 +138,7 @@ under the License. <decorator-section name="body"> <container style="lefthalf"> <screenlet title="${uiLabelMap.OrderRequestInformation}"> - <include-form name="requestInfo" location="component://order/widget/ordermgr/CustRequestForms.xml"/> + <include-form name="RequestInfo" location="component://order/widget/ordermgr/CustRequestForms.xml"/> </screenlet> </container> <container style="righthalf"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |