svn commit: r946075 - in /ofbiz/branches/release10.04: ./ applications/accounting/widget
Locked
svn commit: r946075 - in /ofbiz/branches/release10.04: ./ applications/accounting/widget
 
|
Author: jleroux
Date: Wed May 19 07:41:15 2010 New Revision: 946075 URL: http://svn.apache.org/viewvc?rev=946075&view=rev Log: "Applied fix from trunk for revision: 946073" ------------------------------------------------------------------------ r946073 | jleroux | 2010-05-19 09:36:02 +0200 (mer. 19 mai 2010) | 3 lignes Closes "Allow to open a layer lookup from a layer lookup recursively" (https://issues.apache.org/jira/browse/OFBIZ-3693) - OFBIZ-3693 This commit removes all remaining <presentation="window"> ------------------------------------------------------------------------ Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSForms.xml ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml ofbiz/branches/release10.04/applications/content/webapp/content/website/WebSiteForms.xml ofbiz/branches/release10.04/applications/content/widget/compdoc/CompDocForms.xml ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml ofbiz/branches/release10.04/applications/humanres/widget/forms/PartyResumeForms.xml ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/release10.04/applications/product/widget/catalog/CategoryForms.xml ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/branches/release10.04/applications/product/widget/catalog/WebAnalyticsForms.xml ofbiz/branches/release10.04/applications/product/widget/facility/FacilityForms.xml ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/ForumForms.xml ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 07:41:15 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073 Modified: ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml Wed May 19 07:41:15 2010 @@ -571,7 +571,7 @@ under the License. </drop-down> </field> <field name="workEffortId"> - <lookup presentation="window" target-form-name="LookupWorkEffort"/> + <lookup target-form-name="LookupWorkEffort"/> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml Wed May 19 07:41:15 2010 @@ -410,7 +410,7 @@ under the License. </drop-down> </field> <field name="maintTemplateWorkEffortId" use-when="fixedAssetMaint==null" title="${uiLabelMap.AccountingFixedAssetMaintenanceTemplate}" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage3}"> - <lookup presentation="window" target-form-name="LookupWorkEffort"/> + <lookup target-form-name="LookupWorkEffort"/> </field> <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"> <drop-down allow-empty="true"> Modified: ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml Wed May 19 07:41:15 2010 @@ -58,7 +58,7 @@ under the License. <field name="invoiceId" position="2"><lookup target-form-name="LookupInvoice" size="20" maxlength="20"/></field> <field name="paymentId" position="1"><lookup target-form-name="LookupPayment" size="20" maxlength="20"/></field> <field name="productId" position="2"><lookup target-form-name="LookupProduct" size="20" maxlength="20"/></field> - <field name="workEffortId" position="1"><lookup presentation="window" target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> + <field name="workEffortId" position="1"><lookup target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> <field name="shipmentId" position="2"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field> <field name="fromDate" position="1"><date-time/></field> <field name="thruDate" position="2"><date-time/></field> @@ -236,7 +236,7 @@ under the License. <field name="invoiceId"><lookup target-form-name="LookupInvoice" size="20" maxlength="20"/></field> <field name="paymentId"><lookup target-form-name="LookupPayment" size="20" maxlength="20"/></field> <field name="produtId"><lookup target-form-name="LookupProduct" size="20" maxlength="20"/></field> - <field name="workEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> + <field name="workEffortId"><lookup target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> <field name="shipmentId"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field> <field name="fromDate"><date-time/></field> <field name="thruDate"><date-time/></field> @@ -453,7 +453,7 @@ under the License. <field name="invoiceId" position="1"><lookup target-form-name="LookupInvoice" size="20" maxlength="20"/></field> <field name="paymentId" position="2"><lookup target-form-name="LookupPayment" size="20" maxlength="20"/></field> <field name="produtId" position="1"><lookup target-form-name="LookupProduct" size="20" maxlength="20"/></field> - <field name="workEffortId" position="2"><lookup presentation="window" target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> + <field name="workEffortId" position="2"><lookup target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> <field name="shipmentId" position="1"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field> <field name="fixedAssetId" position="2"> <drop-down allow-empty="true"> @@ -529,7 +529,7 @@ under the License. </drop-down> </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName" size="20" maxlength="20"/></field> - <field name="workEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> + <field name="workEffortId"><lookup target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> <field name="invoiceId"> <lookup target-form-name="LookupInvoice" size="20" maxlength="20"> <sub-hyperlink target="invoiceOverview?invoiceId=${acctgTrans.invoiceId}" description="${acctgTrans.invoiceId}"/> @@ -744,7 +744,7 @@ under the License. <field name="invoiceId" position="1"><lookup target-form-name="LookupInvoice" size="20" maxlength="20"/></field> <field name="paymentId" position="2"><lookup target-form-name="LookupPayment" size="20" maxlength="20"/></field> <field name="productId" position="1"><lookup target-form-name="LookupProduct" size="20" maxlength="20"/></field> - <field name="workEffortId" position="2"><lookup presentation="window" target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> + <field name="workEffortId" position="2"><lookup target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> <field name="shipmentId" position="1"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field> <field name="fixedAssetId" position="2"> <drop-down allow-empty="true"> Modified: ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml Wed May 19 07:41:15 2010 @@ -278,7 +278,7 @@ under the License. </drop-down> </field> <field name="partyId"><lookup target-form-name="LookupPartyName"></lookup></field> - <field name="workEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort"><sub-hyperlink target="ww" description="${workEffortName}"/></lookup></field> + <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"><sub-hyperlink target="ww" description="${workEffortName}"/></lookup></field> <field name="emplPositionTypeId" position="2"> <drop-down allow-empty="true"> <entity-options entity-name="EmplPositionType" description="${description}"> Modified: ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSForms.xml (original) +++ ofbiz/branches/release10.04/applications/content/webapp/content/cms/CMSForms.xml Wed May 19 07:41:15 2010 @@ -475,7 +475,7 @@ under the License. </drop-down> </field> <field name="ownerContentId" position="2"> - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="contentName" position="1"> <text/> Modified: ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml (original) +++ ofbiz/branches/release10.04/applications/content/webapp/content/survey/SurveyForms.xml Wed May 19 07:41:15 2010 @@ -29,7 +29,7 @@ under the License. <field name="allowMultiple"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> <field name="allowUpdate"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> <field name="acroFormContentId"> - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> @@ -68,7 +68,7 @@ under the License. <field name="allowUpdate"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> <field name="acroFormContentId" use-when="survey!=null"> - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="acroFormContentId" use-when="survey==null"><ignored/></field> Modified: ofbiz/branches/release10.04/applications/content/webapp/content/website/WebSiteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/webapp/content/website/WebSiteForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/webapp/content/website/WebSiteForms.xml (original) +++ ofbiz/branches/release10.04/applications/content/webapp/content/website/WebSiteForms.xml Wed May 19 07:41:15 2010 @@ -134,7 +134,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createWebSiteContent"/> <field name="webSiteId" map-name="webSite"><display also-hidden="true"/></field> - <field name="contentId"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="contentId"><lookup target-form-name="LookupContent"/></field> <field name="webSiteContentTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="WebSiteContentType" description="${description}"> Modified: ofbiz/branches/release10.04/applications/content/widget/compdoc/CompDocForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/widget/compdoc/CompDocForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/widget/compdoc/CompDocForms.xml (original) +++ ofbiz/branches/release10.04/applications/content/widget/compdoc/CompDocForms.xml Wed May 19 07:41:15 2010 @@ -123,7 +123,7 @@ under the License. <field name="rootContentId" map-name="empty" widget-style="buttontext"><hidden/></field> <field name="rootContentRevisionSeqId" map-name="empty" widget-style="buttontext"><hidden/></field> - <field name="contentId" widget-style="buttontext"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="contentId" widget-style="buttontext"><lookup target-form-name="LookupContent"/></field> <field name="contentRevisionSeqId" widget-style="inputBox"><text/></field> <!-- <field name="contentRevisionSeqId"> <drop-down allow-empty="true"> @@ -188,7 +188,7 @@ under the License. <field name="rootContentId" map-name="empty" widget-style="buttontext"><hidden/></field> <field name="rootContentRevisionSeqId" map-name="empty" widget-style="buttontext"><hidden/></field> - <field name="contentId" widget-style="buttontext"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="contentId" widget-style="buttontext"><lookup target-form-name="LookupContent"/></field> <field name="contentRevisionSeqId" widget-style="inputBox"><text/></field> <field name="itemContentId" widget-style="inputBox"><text/></field> <field name="oldDataResourceId" widget-style="inputBox"><text/></field> Modified: ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml Wed May 19 07:41:15 2010 @@ -43,10 +43,10 @@ under the License. </drop-down> </field> <field name="dataResourceId" position="1"> - <lookup presentation="window" target-form-name="LookupDataResource"/> + <lookup target-form-name="LookupDataResource"/> </field> <field name="ownerContentId" position="2"> - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="statusId"> <drop-down allow-empty="true"> @@ -56,7 +56,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="createdByUserLogin" position="2"><lookup presentation="window" target-form-name="LookupPerson"/></field> + <field name="createdByUserLogin" position="2"><lookup target-form-name="LookupPerson"/></field> <field name="localeString"> <drop-down allow-empty="true"> <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"> @@ -164,9 +164,9 @@ under the License. </sub-hyperlink> </lookup> </field> - <field name="ownerContentId"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> <field name="decoratorContentId"> - <lookup presentation="window" target-form-name="LookupContent"> + <lookup target-form-name="LookupContent"> <sub-hyperlink use-when=""${currentValue.decoratorContentId}".length()>0" link-style="buttontext" target="EditContent" description="${uiLabelMap.ContentGoToContent}"> <parameter param-name="contentId" from-field="currentValue.decoratorContentId"/> </sub-hyperlink> @@ -213,7 +213,7 @@ under the License. <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/> </drop-down> </field> - <field name="ownerContentId" title="${uiLabelMap.CommonEmptyHeader}"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="ownerContentId" title="${uiLabelMap.CommonEmptyHeader}"><lookup target-form-name="LookupContent"/></field> <field name="mimeTypeId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/> @@ -265,7 +265,7 @@ under the License. <auto-fields-entity entity-name="ContentAssoc"/> <field name="contentId" widget-style="tabletext"><display description="${contentId}"/></field> <field name="contentIdTo" map-name="currentValue"> - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="contentAssocTypeId"> <drop-down allow-empty="true"> @@ -356,7 +356,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentRole"/> <field name="contentId" widget-style="buttontext" > - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="partyId" widget-style="buttontext"><lookup target-form-name="LookupPerson"/></field> <field name="roleTypeId"> @@ -402,7 +402,7 @@ under the License. <form name="AddContentPurpose" target="addContentPurpose" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentPurpose"/> - <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" ><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" ><lookup target-form-name="LookupContent"/></field> <field name="contentPurposeTypeId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"> @@ -434,7 +434,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentAttribute"/> <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -461,7 +461,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentMetaData"/> <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="metaDataPredicateId"> <drop-down allow-empty="true"> @@ -518,7 +518,7 @@ under the License. <auto-fields-service service-name="createWorkEffortContent"/> <field name="contentId"><hidden value="${parameters.contentId}"/></field> <field name="workEffortId"> - <lookup presentation="window" target-form-name="LookupWorkEffort"/> + <lookup target-form-name="LookupWorkEffort"/> </field> <field name="workEffortContentTypeId"> <drop-down no-current-selected-key=""> Modified: ofbiz/branches/release10.04/applications/humanres/widget/forms/PartyResumeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/humanres/widget/forms/PartyResumeForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/humanres/widget/forms/PartyResumeForms.xml (original) +++ ofbiz/branches/release10.04/applications/humanres/widget/forms/PartyResumeForms.xml Wed May 19 07:41:15 2010 @@ -24,7 +24,7 @@ under the License. <auto-fields-entity entity-name="PartyResume" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> - <field name="contentId"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="contentId"><lookup target-form-name="LookupContent"/></field> <field name="resumeId"><lookup target-form-name="LookupPartyResume"/></field> <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -63,7 +63,7 @@ under the License. <alt-target use-when="partyResume != null" target="updatePartyResume"/> <field name="resumeId" use-when="partyResume!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field name="resumeId" use-when="partyResume==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> - <field name="contentId"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="contentId"><lookup target-form-name="LookupContent"/></field> <field name="partyId" use-when="partyResume!=null&&partyId!=null" title="${uiLabelMap.FormFieldTitle_partyId}"><hidden/></field> <field name="partyId" use-when="partyResume==null&&partyId==null" title="${uiLabelMap.FormFieldTitle_partyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="resumeDate"><date-time/></field> Modified: ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml (original) +++ ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml Wed May 19 07:41:15 2010 @@ -516,7 +516,7 @@ under the License. <alt-target use-when="workEffort==null" target="createworkeffort"/> <field name="custRequestId"><hidden/></field> <field name="custRequestItemSeqId"><hidden/></field> - <field name="workEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml Wed May 19 07:41:15 2010 @@ -555,7 +555,7 @@ under the License. </drop-down> </field> <!-- note sure if these two are necessray, but they are kind of confusing in this context: - <field name="ownerContentId"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> <field name="dataResourceId"><lookup target-form-name="LookupDataResource"/></field> --> <field name="contentTypeId"> Modified: ofbiz/branches/release10.04/applications/product/widget/catalog/CategoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/CategoryForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/widget/catalog/CategoryForms.xml (original) +++ ofbiz/branches/release10.04/applications/product/widget/catalog/CategoryForms.xml Wed May 19 07:41:15 2010 @@ -44,7 +44,7 @@ under the License. <auto-fields-entity entity-name="ProductCategoryContent"/> <field name="productCategoryId" map-name="productCategory"><hidden/></field> <field name="contentId" title="${uiLabelMap.ProductContentId}"> - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="prodCatContentTypeId"> <drop-down> Modified: ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml Wed May 19 07:41:15 2010 @@ -553,7 +553,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ProductContent"/> <field name="productId" title="${uiLabelMap.ProductProductId}" map-name="product"><hidden/></field> - <field name="contentId" title="${uiLabelMap.ProductContentId}"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="contentId" title="${uiLabelMap.ProductContentId}"><lookup target-form-name="LookupContent"/></field> <field name="productContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}"> <drop-down> <entity-options entity-name="ProductContentType" description="${description}"> @@ -1316,7 +1316,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="maintTemplateWorkEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="intervalUomId"> <drop-down allow-empty="true"> <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> @@ -1351,7 +1351,7 @@ under the License. </drop-down> </field> <field name="maintName"><text size="20"/></field> - <field name="maintTemplateWorkEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="intervalUomId"> <drop-down allow-empty="false"> <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> @@ -1716,7 +1716,7 @@ under the License. <auto-fields-service service-name="createWorkEffortGoodStandard"/> <field name="productId"><hidden value="${parameters.productId}"/></field> <field name="workEffortId"> - <lookup presentation="window" target-form-name="LookupWorkEffort"/> + <lookup target-form-name="LookupWorkEffort"/> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> Modified: ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml (original) +++ ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml Wed May 19 07:41:15 2010 @@ -335,7 +335,7 @@ under the License. <field name="parentResourceId"><ignored/></field> <field name="description" title="${uiLabelMap.CommonDescription}"/> - <field name="contentId"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="contentId"><lookup target-form-name="LookupContent"/></field> <field name="webSiteId"> <drop-down allow-empty="true"> <entity-options entity-name="WebSite" description="${siteName} [${webSiteId}]"> Modified: ofbiz/branches/release10.04/applications/product/widget/catalog/WebAnalyticsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/WebAnalyticsForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/widget/catalog/WebAnalyticsForms.xml (original) +++ ofbiz/branches/release10.04/applications/product/widget/catalog/WebAnalyticsForms.xml Wed May 19 07:41:15 2010 @@ -119,7 +119,7 @@ under the License. </drop-down> </field> <field name="contentId"> - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field use-when="webAnalyticsConfig!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field use-when="webAnalyticsConfig==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/branches/release10.04/applications/product/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/facility/FacilityForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/widget/facility/FacilityForms.xml (original) +++ ofbiz/branches/release10.04/applications/product/widget/facility/FacilityForms.xml Wed May 19 07:41:15 2010 @@ -889,7 +889,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table" target="createFacilityContent?facilityId=${facilityId}"> <field name="facilityId"><hidden/></field> <field name="contentId" title="${uiLabelMap.FormFieldTitle_existContentId}"> - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="contentTypeId" title="${uiLabelMap.FormFieldTitle_contentTypeId}"> <drop-down allow-empty="false" no-current-selected-key="DOCUMENT"> @@ -907,7 +907,7 @@ under the License. </drop-down> </field> <field name="dataResourceName" title="${uiLabelMap.CommonUpload}"><file/></field> - <field name="contentIdFrom" title="${uiLabelMap.ContentCompDocParentContentId}"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="contentIdFrom" title="${uiLabelMap.ContentCompDocParentContentId}"><lookup target-form-name="LookupContent"/></field> <field name="createButton"><submit button-type="button"/></field> </form> Modified: ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml (original) +++ ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml Wed May 19 07:41:15 2010 @@ -58,9 +58,9 @@ under the License. </entity-options> </drop-down> </field> - <field name="workEffortParentId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> - <field name="facilityId"><lookup presentation="window" target-form-name="LookupFacility"/></field> - <field name="fixedAssetId"><lookup presentation="window" target-form-name="LookupFixedAsset"/></field> + <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> + <field name="facilityId"><lookup target-form-name="LookupFacility"/></field> + <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> <field name="scopeEnumId"> <drop-down allow-empty="true"> <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> @@ -126,7 +126,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="workEffortParentId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="facilityId"><lookup target-form-name="LookupFacility"/></field> <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> Modified: ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml (original) +++ ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml Wed May 19 07:41:15 2010 @@ -59,7 +59,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="workEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="hours"><text size="5"/></field> <field name="comments"><text size="40"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -259,7 +259,7 @@ under the License. </drop-down> </field> - <field name="workEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field> <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field> Modified: ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml Wed May 19 07:41:15 2010 @@ -124,7 +124,7 @@ under the License. </field> -<!-- <field name="workEffortParentId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> --> +<!-- <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> --> <field name="facilityId"><lookup target-form-name="LookupFacility"/></field> <!-- <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> --> <field name="moneyUomId" title="${uiLabelMap.CommonCurrency}"> @@ -291,7 +291,7 @@ under the License. <field name="workEffortId"><hidden value=""/></field> --> <field name="workEffortIdFrom"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName} [${workEffortId}]"/></field> - <field name="workEffortIdTo"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="workEffortIdTo"><lookup target-form-name="LookupWorkEffort"/></field> <field name="workEffortAssocTypeId"> <drop-down> <entity-options entity-name="WorkEffortAssocType" description="${description}"> @@ -319,7 +319,7 @@ under the License. <form name="AddWorkEffortAssoc" target="createWorkEffortAssoc" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortIdFrom"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName} [${workEffortId}]"/></field> - <field name="workEffortIdTo"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="workEffortIdTo"><lookup target-form-name="LookupWorkEffort"/></field> <field name="workEffortAssocTypeId"> <drop-down> <entity-options entity-name="WorkEffortAssocType" description="${description}"> @@ -966,7 +966,7 @@ under the License. <auto-fields-service service-name="createWorkEffortContent"/> <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> <field name="contentId"> - <lookup presentation="window" target-form-name="LookupContent"/> + <lookup target-form-name="LookupContent"/> </field> <field name="workEffortContentTypeId"> <drop-down no-current-selected-key=""> Modified: ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml (original) +++ ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml Wed May 19 07:41:15 2010 @@ -60,7 +60,7 @@ under the License. <form name="lookupPartyNameByName" target="LookupPartyExampleByName" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="LayerFromLayer" title="${uiLabelMap.ExampleLayerFromLayer}"> - <lookup presentation="window" target-form-name="LookupPartyExample" position="center"/> + <lookup target-form-name="LookupPartyExample" position="center"/> </field> <field name="CalendarFromLayer" title="${uiLabelMap.ExampleCalendarFromLayer}"><date-time/></field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field> Modified: ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml Wed May 19 07:41:15 2010 @@ -140,7 +140,7 @@ </field> <field name="intervalQuantity"><text/></field> <field name="repeatCount"><text/></field> - <field name="maintTemplateWorkEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="deleteProductMaint" description="${uiLabelMap.CommonDelete}" also-hidden="false"> Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/ForumForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/ForumForms.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/ecommerce/widget/ForumForms.xml Wed May 19 07:41:15 2010 @@ -346,7 +346,7 @@ under the License. <option key="TEMPLATE_COMPOSITE" description="${uiLabelMap.EcommerceNestedContent}"/> </drop-down> </field> - <field name="ownerContentId"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> <field name="mimeTypeId"> <drop-down allow-empty="true"> <entity-options description="${mimeTypeId} - ${description}" entity-name="MimeType" key-field-name="mimeTypeId"> Modified: ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=946075&r1=946074&r2=946075&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed May 19 07:41:15 2010 @@ -356,7 +356,7 @@ <field name="workEffortAssocTypeId"><hidden/></field> <field name="workEffortIdTo" entry-name="workEffortId"><hidden/></field> <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}*"><display/></field> - <field name="projectId" title="${uiLabelMap.ProjectMgrWorkEffortIdFrom}"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="projectId" title="${uiLabelMap.ProjectMgrWorkEffortIdFrom}"><lookup target-form-name="LookupWorkEffort"/></field> <field name="fromDate"><date-time/></field> <field name="currentStatusId"> <drop-down allow-empty="false" current-description="${currentStatus.description}"> @@ -899,7 +899,7 @@ </drop-down> </field> <!-- note sure if these two are necessray, but they are kind of confusing in this context: - <field name="ownerContentId"><lookup presentation="window" target-form-name="LookupContent"/></field> + <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> <field name="dataResourceId"><lookup target-form-name="LookupDataResource"/></field> --> <field name="contentTypeId"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |