svn commit: r1786986 - in /ofbiz/ofbiz-framework/trunk/a
Locked
svn commit: r1786986 - in /ofbiz/ofbiz-framework/trunk/a
 
|
Author: jleroux
Date: Wed Mar 15 07:23:50 2017 New Revision: 1786986 URL: http://svn.apache.org/viewvc?rev=1786986&view=rev Log: Reverted: refactor list related forms in Lookup widgets (OFBIZ-9232) I found 2 errors I did not spot earlier <grid name="ListAgreements" uses type="list" <grid name="ListPaymentGroupMember" does not end with </grid I prefer to revert because the grid concept is questionned by Taher. No need to complicate later if we ever revert it all Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FieldLookupForms.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=1786986&r1=1786985&r2=1786986&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FieldLookupForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FieldLookupForms.xml Wed Mar 15 07:23:50 2017 @@ -36,7 +36,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> - <grid name="ListLookupFixedAsset" list-name="listIt" title="" paginate-target="LookupFixedAsset" + <form name="ListLookupFixedAsset" list-name="listIt" title="" type="list" paginate-target="LookupFixedAsset" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -51,7 +51,7 @@ under the License. </field> <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field> <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field> - </grid> + </form> <form name="LookupBudget" target="LookupBudget" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Budget" default-field-type="hidden"/> @@ -94,7 +94,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> - <grid name="ListBillingAccount" list-name="listIt" title="" paginate-target="LookupBillingAccount" + <form name="ListBillingAccount" list-name="listIt" title="" type="list" paginate-target="LookupBillingAccount" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -110,7 +110,7 @@ under the License. </field> <field name="description"><display/></field> <field name="externalAccountId" title="${uiLabelMap.AccountingExternalAccountId}"><display/></field> - </grid> + </form> <form name="LookupGlAccount" target="LookupGlAccount" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> @@ -134,8 +134,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="ListLookupGlAccount" list-name="listIt" title="" paginate-target="LookupGlAccount" + <form name="ListLookupGlAccount" list-name="listIt" title="" type="list" paginate-target="LookupGlAccount" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -152,7 +151,6 @@ under the License. <field name="glAccountTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="GlAccountType"/></field> <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"><display-entity entity-name="GlAccountClass"/></field> </form> - <form name="LookupPayment" target="LookupPayment" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Payment" default-field-type="hidden"/> @@ -164,8 +162,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="ListPayment" list-name="listIt" title="" paginate-target="LookupPayment" + <form name="ListPayment" list-name="listIt" title="" type="list" paginate-target="LookupPayment" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -184,7 +181,7 @@ under the License. <field name="amount"><display/></field> <field name="currencyUomId"><display/></field> </form> - + <form name="LookupInvoice" target="LookupInvoice" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <!--auto-fields-entity entity-name="Invoice" default-field-type="hidden" /--> @@ -209,8 +206,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="ListInvoice" list-name="listIt" title="" paginate-target="LookupInvoice" + <form name="ListInvoice" list-name="listIt" title="" type="list" paginate-target="LookupInvoice" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -242,8 +238,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> - - <grid name="ListAgreements" list-name="listIt" title="" type="list" target="LookupAgreement" + <form name="ListAgreements" list-name="listIt" title="" type="list" target="LookupAgreement" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -260,7 +255,7 @@ under the License. <field name="agreementDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="agreementTypeId"><display/></field> <field name="description"><display/></field> - </grid> + </form> <form name="LookupAgreementItem" target="LookupAgreementItem" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> @@ -274,8 +269,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> - - <grid name="ListAgreementItems" list-name="listIt" title="" target="LookupAgreementItem" + <form name="ListAgreementItems" list-name="listIt" title="" type="list" target="LookupAgreementItem" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -291,7 +285,7 @@ under the License. </field> <field name="agreementItemTypeId"><display/></field> <field name="currencyUomId"><display/></field> - </grid> + </form> <form name="LookupPaymentGroupMember" target="LookupPaymentGroupMember" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="paymentGroupId"><text-find/></field> @@ -302,8 +296,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> - - <grid name="ListPaymentGroupMember" list-name="listIt" title="" target="LookupPaymentGroupMember" + <form name="ListPaymentGroupMember" list-name="listIt" title="" type="list" target="LookupPaymentGroupMember" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -330,7 +323,7 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <grid name="ListLookupReconciliation" list-name="listIt" target="LookupGlReconciliation" + <form name="ListLookupReconciliation" list-name="listIt" type="list" target="LookupGlReconciliation" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -346,7 +339,7 @@ under the License. <field name="glReconciliationName"><display/></field> <field name="organizationPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}[${partyId}]"/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> - </grid> + </form> <form name="LookupCustomTimePeriod" target="LookupCustomTimePeriod" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> @@ -373,7 +366,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> - <grid name="ListLookupCustomTimePeriod" list-name="listIt" title="" paginate-target="LookupCustomTimePeriod" + <form name="ListLookupCustomTimePeriod" list-name="listIt" title="" type="list" paginate-target="LookupCustomTimePeriod" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -393,5 +386,5 @@ under the License. <field name="fromDate"><display/></field> <field name="thruDate"><display/></field> <field name="isClosed"><display/></field> - </grid> + </form> </forms> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml?rev=1786986&r1=1786985&r2=1786986&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml Wed Mar 15 07:23:50 2017 @@ -41,7 +41,7 @@ under the License. <include-form name="LookupPayment" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListPayment" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListPayment" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -68,7 +68,7 @@ under the License. <include-form name="LookupInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -95,7 +95,7 @@ under the License. <include-form name="LookupFixedAsset" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListLookupFixedAsset" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListLookupFixedAsset" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -123,7 +123,7 @@ under the License. <include-form name="lookupBillingAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListBillingAccount" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListBillingAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -151,7 +151,7 @@ under the License. <include-form name="LookupGlAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListLookupGlAccount" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListLookupGlAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -179,7 +179,7 @@ under the License. <include-form name="LookupAgreement" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListAgreements" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListAgreements" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -207,7 +207,7 @@ under the License. <include-form name="LookupAgreementItem" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListAgreementItems" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListAgreementItems" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -235,7 +235,7 @@ under the License. <include-form name="LookupPaymentGroupMember" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListPaymentGroupMember" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListPaymentGroupMember" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -262,7 +262,7 @@ under the License. <include-form name="LookupGlReconciliation" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListLookupReconciliation" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListLookupReconciliation" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -287,7 +287,7 @@ under the License. <include-form name="LookupCustomTimePeriod" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-grid name="ListLookupCustomTimePeriod" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListLookupCustomTimePeriod" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |