svn commit: r739656 - in /ofbiz/trunk/applications/mark
Locked
svn commit: r739656 - in /ofbiz/trunk/applications/mark
 
|
Author: mrisaliti
Date: Sat Jan 31 23:56:33 2009 New Revision: 739656 URL: http://svn.apache.org/viewvc?rev=739656&view=rev Log: Artifact cleaning on marketing component after recent changes on xsd files (OFBIZ-2137) Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml ofbiz/trunk/applications/marketing/widget/CommonScreens.xml ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Sat Jan 31 23:56:33 2009 @@ -88,7 +88,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="MarketingCampaignRole"> - <field-map field-name="marketingCampaignId" env-name="marketingCampaignId" /> + <field-map field-name="marketingCampaignId" from-field="marketingCampaignId" /> </entity-and> </actions> <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Sat Jan 31 23:56:33 2009 @@ -112,8 +112,8 @@ <form name="ListContactLists" target="ListContactLists" title="" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="contactListId"/> <field-map field-name="entityName" value="ContactList"/> </service> @@ -185,8 +185,8 @@ <form name="ListContactListParties" type="list" title="" list-name="listIt" paginate-target="ListContactListParties" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="partyId"/> <field-map field-name="entityName" value="ContactListParty"/> </service> @@ -313,8 +313,8 @@ <form name="ListContactListCommEvents" list-name="listIt" title="" type="list" paginate-target="ListContactListCommEvents" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> - <field-map field-name="inputFields" env-name="parameters"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="CommunicationEvent"/> </service> </actions> @@ -368,8 +368,8 @@ <form name="ListLookupContactList" list-name="listIt" target="" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> - <field-map env-name="parameters" field-name="inputFields"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map from-field="parameters" field-name="inputFields"/> <field-map value="ContactList" field-name="entityName"/> </service> </actions> @@ -413,9 +413,9 @@ <form name="ListLookupCommEvent" target="" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> - <field-map env-name="parameters" field-name="inputFields"/> - <field-map env-name="entityName" field-name="entityName"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map from-field="parameters" field-name="inputFields"/> + <field-map from-field="entityName" field-name="entityName"/> </service> </actions> <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml Sat Jan 31 23:56:33 2009 @@ -79,8 +79,8 @@ <form name="ListDataSourceType" type="list" title="" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="dataSourceTypeId"/> <field-map field-name="entityName" value="DataSourceType"/> </service> @@ -113,9 +113,9 @@ <form name="ListLookupDataSource" target="" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> - <field-map env-name="parameters" field-name="inputFields"/> - <field-map env-name="entityName" field-name="entityName"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map from-field="parameters" field-name="inputFields"/> + <field-map from-field="entityName" field-name="entityName"/> </service> </actions> <field name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" widget-style="buttontext"> @@ -134,9 +134,9 @@ <form name="ListLookupDataSourceType" target="" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> - <field-map env-name="parameters" field-name="inputFields"/> - <field-map env-name="entityName" field-name="entityName"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map from-field="parameters" field-name="inputFields"/> + <field-map from-field="entityName" field-name="entityName"/> </service> </actions> <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml Sat Jan 31 23:56:33 2009 @@ -33,8 +33,8 @@ <form name="listLookupSegmentGroup" list-name="listIt" target="" title="" type="list" paginate-target="LookupSegmentGroup" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SegmentGroup"/> </service> </actions> @@ -82,8 +82,8 @@ <form name="ListLookupSalesForecast" list-name="listIt" type="list" paginate-target="LookupSalesForecast" view-size="10" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalesForecast"/> </service> </actions> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml Sat Jan 31 23:56:33 2009 @@ -24,8 +24,8 @@ <form name="FindSegmentGroup" list-name="listIt" target="" title="" type="list" paginate-target="FindSegmentGroup" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SegmentGroup"/> <field-map field-name="noConditionFind" value="Y"/> </service> @@ -138,8 +138,8 @@ <form name="listSegmentGroupRole" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupRole" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SegmentGroupRole"/> <field-map field-name="noConditionFind" value="Y"/> </service> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml Sat Jan 31 23:56:33 2009 @@ -128,8 +128,8 @@ <form name="ListTrackingCodeOrders" type="list" title="" paginate-target="FindTrackingCodeOrders" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="-orderId"/> <field-map field-name="entityName" value="TrackingCodeOrder"/> </service> @@ -175,9 +175,9 @@ <form name="ListTrackingCodeVisits" list-name="listIt" title="" paginate-target="FindTrackingCodeVisits" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> - <field-map env-name="requestParameters" field-name="inputFields"/> - <field-map env-name="entityName" field-name="entityName"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map from-field="requestParameters" field-name="inputFields"/> + <field-map from-field="entityName" field-name="entityName"/> <field-map field-name="orderBy" value="-fromDate"/> </service> </actions> @@ -220,9 +220,9 @@ <form name="ListLookupTrackingCode" target="" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> - <field-map env-name="parameters" field-name="inputFields"/> - <field-map env-name="entityName" field-name="entityName"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map from-field="parameters" field-name="inputFields"/> + <field-map from-field="entityName" field-name="entityName"/> </service> </actions> <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" widget-style="buttontext"> @@ -245,9 +245,9 @@ <form name="ListLookupVisit" target="" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> - <field-map env-name="parameters" field-name="inputFields"/> - <field-map env-name="entityName" field-name="entityName"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map from-field="parameters" field-name="inputFields"/> + <field-map from-field="entityName" field-name="entityName"/> </service> </actions> <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}" widget-style="buttontext"> @@ -306,9 +306,9 @@ <form name="ListLookupTrackingCodeType" target="" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> - <field-map env-name="parameters" field-name="inputFields"/> - <field-map env-name="entityName" field-name="entityName"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map from-field="parameters" field-name="inputFields"/> + <field-map from-field="entityName" field-name="entityName"/> </service> </actions> <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml Sat Jan 31 23:56:33 2009 @@ -27,7 +27,7 @@ <menu-item name="TrackingCodeOrder" title="${uiLabelMap.MarketingTrackingCodeOrder}"> <condition> <not> - <if-empty field-name="trackingCodeId"/> + <if-empty field="trackingCodeId"/> </not> </condition> <link target="/FindTrackingCodeOrders?trackingCodeId=${trackingCodeId}"/> @@ -35,7 +35,7 @@ <menu-item name="TrackingCodeVisit" title="${uiLabelMap.MarketingTrackingCodeVisit}"> <condition> <not> - <if-empty field-name="trackingCodeId"/> + <if-empty field="trackingCodeId"/> </not> </condition> <link target="/FindTrackingCodeVisits?trackingCodeId=${trackingCodeId}"/> Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Sat Jan 31 23:56:33 2009 @@ -54,7 +54,7 @@ <set field="headerItem" value="ContactList"/> <set field="tabButtonItem" value="ContactList"/> <set field="contactListId" from-field="parameters.contactListId"/> - <entity-one entity-name="ContactList" value-name="contactList"/> + <entity-one entity-name="ContactList" value-field="contactList"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -66,7 +66,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="contactListId"/></not></condition> + <condition><not><if-empty field="contactListId"/></not></condition> <widgets> <include-menu name="ContactListTabBar" location="component://marketing/webapp/marketing/contact/ContactListMenus.xml"/> <container> Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Sat Jan 31 23:56:33 2009 @@ -62,14 +62,14 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactLists"/> <set field="contactListId" from-field="parameters.contactListId"/> - <entity-one entity-name="ContactList" value-name="contactList"/> + <entity-one entity-name="ContactList" value-field="contactList"/> </actions> <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="contactList"/></not> + <not><if-empty field="contactList"/></not> </condition> <widgets> <container style="screenlet"> @@ -160,12 +160,12 @@ <set field="contactListId" from-field="parameters.contactListId"/> <set field="partyId" from-field="parameters.partyId"/> <set field="fromDate" from-field="parameters.fromDate"/> - <entity-one entity-name="ContactListParty" value-name="contactListParty"/> - <entity-condition entity-name="ContactListPartyAndStatus" list-name="contactListPartyStatusList"> + <entity-one entity-name="ContactListParty" value-field="contactListParty"/> + <entity-condition entity-name="ContactListPartyAndStatus" list="contactListPartyStatusList"> <condition-list combine="and"> - <condition-expr field-name="contactListId" env-name="contactListId"/> - <condition-expr field-name="partyId" env-name="partyId"/> - <condition-expr field-name="fromDate" env-name="fromDate"/> + <condition-expr field-name="contactListId" from-field="contactListId"/> + <condition-expr field-name="partyId" from-field="partyId"/> + <condition-expr field-name="fromDate" from-field="fromDate"/> </condition-list> <order-by field-name="-statusDate"/> </entity-condition> @@ -185,7 +185,7 @@ <container><link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> <container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container> - <iterate-section entry-name="contactListPartyStatus" list-name="contactListPartyStatusList"> + <iterate-section entry="contactListPartyStatus" list="contactListPartyStatusList"> <section> <widgets> <container><label text="${contactListPartyStatus.statusDate} ${contactListPartyStatus.description} [by: ${contactListPartyStatus.setByUserLoginId}] [code: ${contactListPartyStatus.optInVerifyCode}]"/></container> @@ -283,7 +283,7 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/> <set field="contactListId" from-field="parameters.contactListId"/> <set field="communicationEventId" from-field="parameters.communicationEventId"/> - <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/> + <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> <!-- get the current log in user's default email --> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/> Modified: ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml Sat Jan 31 23:56:33 2009 @@ -27,7 +27,7 @@ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="headerItem" value="DataSource"/> <set field="dataSourceId" from-field="parameters.dataSourceId"/> - <entity-one entity-name="DataSource" value-name="dataSource"/> + <entity-one entity-name="DataSource" value-field="dataSource"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -64,14 +64,14 @@ <set field="dataSourceTabButtonItem" value="DataSource"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListDataSource"/> <set field="dataSourceId" from-field="parameters.dataSourceId"/> - <entity-one entity-name="DataSource" value-name="dataSource"/> + <entity-one entity-name="DataSource" value-field="dataSource"/> </actions> <widgets> <decorator-screen name="CommonDataSourceDecorator"> <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="dataSource"/></not> + <not><if-empty field="dataSource"/></not> </condition> <widgets> <container style="screenlet"> @@ -157,14 +157,14 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListDataSourceType"/> <set field="dataSourceTypeId" from-field="parameters.dataSourceTypeId"/> - <entity-one entity-name="DataSourceType" value-name="dataSourceType"/> + <entity-one entity-name="DataSourceType" value-field="dataSourceType"/> </actions> <widgets> <decorator-screen name="CommonDataSourceDecorator"> <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="dataSourceType"/></not> + <not><if-empty field="dataSourceType"/></not> </condition> <widgets> <container style="screenlet"> Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Sat Jan 31 23:56:33 2009 @@ -26,7 +26,7 @@ <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/> <set field="headerItem" value="Campaign"/> - <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/> + <entity-one entity-name="MarketingCampaign" value-field="marketingCampaign"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -38,7 +38,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="marketingCampaignId"/></not></condition> + <condition><not><if-empty field="marketingCampaignId"/></not></condition> <widgets> <include-menu name="MarketingCampaignTabBar" location="component://marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml"/> </widgets> @@ -66,14 +66,14 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaign"/> <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/> - <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/> + <entity-one entity-name="MarketingCampaign" value-field="marketingCampaign"/> </actions> <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="marketingCampaign"/></not> + <not><if-empty field="marketingCampaign"/></not> </condition> <widgets> <container style="screenlet"> @@ -160,7 +160,7 @@ <set field="partyId" from-field="parameters.partyId"/> <set field="roleTypeId" from-field="parameters.roleTypeId"/> <set field="fromDate" from-field="parameters.fromDate"/> - <entity-one entity-name="MarketingCampaignRole" value-name="marketingCampaignRole"/> + <entity-one entity-name="MarketingCampaignRole" value-field="marketingCampaignRole"/> </actions> <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Sat Jan 31 23:56:33 2009 @@ -81,7 +81,7 @@ <set field="tabButtonItem" value="Segment"/> <set field="segmentGroupId" from-field="parameters.segmentGroupId"/> - <entity-one entity-name="SegmentGroup" value-name="segmentGroup"/> + <entity-one entity-name="SegmentGroup" value-field="segmentGroup"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -93,7 +93,7 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="segmentGroupId"/></not></condition> + <condition><not><if-empty field="segmentGroupId"/></not></condition> <widgets> <include-menu location="component://marketing/webapp/marketing/segment/SegmentMenus.xml" name="SegmentGroupTabBar"/> <container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> @@ -123,7 +123,7 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/LookupSegmentGroup"/> <set field="segmentGroupId" from-field="parameters.segmentGroupId"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="SegmentGroup" value-name="segmentGroup"/> + <entity-one entity-name="SegmentGroup" value-field="segmentGroup"/> </actions> <widgets> <decorator-screen name="CommonSegmentGroupDecorator"> Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Sat Jan 31 23:56:33 2009 @@ -26,7 +26,7 @@ <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> <set field="headerItem" value="Tracking"/> <set field="trackingCodeId" from-field="parameters.trackingCodeId"/> - <entity-one entity-name="TrackingCode" value-name="trackingCode"/> + <entity-one entity-name="TrackingCode" value-field="trackingCode"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -64,14 +64,14 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/> <set field="trackingCodeId" from-field="parameters.trackingCodeId"/> - <entity-one entity-name="TrackingCode" value-name="trackingCode"/> + <entity-one entity-name="TrackingCode" value-field="trackingCode"/> </actions> <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="trackingCode"/></not> + <not><if-empty field="trackingCode"/></not> </condition> <widgets> <container style="screenlet"> @@ -186,7 +186,7 @@ <set field="orderId" from-field="parameters.partyId"/> <set field="trackingCodeTypeId" from-field="parameters.trackingCodeTypeId"/> <set field="isBillable" from-field="parameters.isBillable"/> - <entity-one entity-name="TrackingCodeOrder" value-name="trackingCodeOrder"/> + <entity-one entity-name="TrackingCodeOrder" value-field="trackingCodeOrder"/> </actions> <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> @@ -291,7 +291,7 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/> <set field="trackingCodeId" from-field="parameters.trackingCodeId"/> <set field="communicationEventId" from-field="parameters.communicationEventId"/> - <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/> + <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> </actions> <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> @@ -436,14 +436,14 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCodeType"/> <set field="trackingCodeTypeId" from-field="parameters.trackingCodeTypeId"/> - <entity-one entity-name="TrackingCodeType" value-name="trackingCodeType"/> + <entity-one entity-name="TrackingCodeType" value-field="trackingCodeType"/> </actions> <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="trackingCodeType"/></not> + <not><if-empty field="trackingCodeType"/></not> </condition> <widgets> <container style="screenlet"> Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Sat Jan 31 23:56:33 2009 @@ -51,7 +51,7 @@ <section> <condition> <not> - <if-empty field-name="partyList"/> + <if-empty field="partyList"/> </not> </condition> <widgets> Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Sat Jan 31 23:56:33 2009 @@ -115,9 +115,9 @@ <actions> <set field="partyId" from-field="parameters.partyId"/> <set field="partyTypeId" from-field="parameters.partyTypeId"/> - <entity-one entity-name="Party" value-name="party"/> - <entity-one entity-name="Person" value-name="lookupPerson"/> - <entity-one entity-name="PartyGroup" value-name="lookupGroup"/> + <entity-one entity-name="Party" value-field="party"/> + <entity-one entity-name="Person" value-field="lookupPerson"/> + <entity-one entity-name="PartyGroup" value-field="lookupGroup"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -130,12 +130,12 @@ <widgets> <section> <condition> - <not><if-empty field-name="party"/></not> + <not><if-empty field="party"/></not> </condition> <widgets> <section> <condition> - <if-compare field-name="headerItem" operator="equals" value="Accounts"/> + <if-compare field="headerItem" operator="equals" value="Accounts"/> </condition> <widgets> <include-menu name="AccountTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> @@ -143,7 +143,7 @@ </section> <section> <condition> - <if-compare field-name="headerItem" operator="equals" value="Leads"/> + <if-compare field="headerItem" operator="equals" value="Leads"/> </condition> <widgets> <include-menu name="LeadTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> @@ -151,7 +151,7 @@ </section> <section> <condition> - <if-compare field-name="headerItem" operator="equals" value="Contacts"/> + <if-compare field="headerItem" operator="equals" value="Contacts"/> </condition> <widgets> <include-menu name="ContactTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> @@ -161,7 +161,7 @@ </section> <section> <condition> - <if-compare field-name="headerItem" operator="equals" value="Contacts"/> + <if-compare field="headerItem" operator="equals" value="Contacts"/> </condition> <widgets> <include-menu name="ContactSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> @@ -169,7 +169,7 @@ </section> <section> <condition> - <if-compare field-name="headerItem" operator="equals" value="Accounts"/> + <if-compare field="headerItem" operator="equals" value="Accounts"/> </condition> <widgets> <include-menu name="AccountSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> @@ -177,7 +177,7 @@ </section> <section> <condition> - <if-compare field-name="headerItem" operator="equals" value="Leads"/> + <if-compare field="headerItem" operator="equals" value="Leads"/> </condition> <widgets> <include-menu name="LeadSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> @@ -186,10 +186,10 @@ <section> <condition> <and> - <not><if-empty field-name="party"/></not> + <not><if-empty field="party"/></not> <or> - <not><if-empty field-name="lookupPerson"/></not> - <not><if-empty field-name="lookupGroup"/></not> + <not><if-empty field="lookupPerson"/></not> + <not><if-empty field="lookupGroup"/></not> </or> </and> </condition> @@ -230,8 +230,8 @@ <section> <condition> <or> - <not><if-empty field-name="leadDescription"/></not> - <not><if-empty field-name="accountLeadDescription"/></not> + <not><if-empty field="leadDescription"/></not> + <not><if-empty field="accountLeadDescription"/></not> </or> </condition> <actions> @@ -241,7 +241,7 @@ </section> <section> <condition> - <not><if-empty field-name="contactDescription"/></not> + <not><if-empty field="contactDescription"/></not> </condition> <actions> <set field="headerItem" value="Contacts"/> @@ -250,7 +250,7 @@ </section> <section> <condition> - <not><if-empty field-name="accountDescription"/></not> + <not><if-empty field="accountDescription"/></not> </condition> <actions> <set field="headerItem" value="Accounts"/> @@ -261,12 +261,12 @@ <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="party"/></not> + <not><if-empty field="party"/></not> </condition> <widgets> <section> <condition> - <if-compare field-name="showOld" operator="equals" value="true" type="Boolean"/> + <if-compare field="showOld" operator="equals" value="true" type="Boolean"/> </condition> <widgets> <container style="button-bar button-style-2"> @@ -281,7 +281,7 @@ </section> <section> <condition> - <not><if-empty field-name="accountDescription"/></not> + <not><if-empty field="accountDescription"/></not> </condition> <widgets> <container style="profile-left"> @@ -300,8 +300,8 @@ <section> <condition> <or> - <not><if-empty field-name="leadDescription"/></not> - <not><if-empty field-name="accountLeadDescription"/></not> + <not><if-empty field="leadDescription"/></not> + <not><if-empty field="accountLeadDescription"/></not> </or> </condition> <widgets> @@ -341,7 +341,7 @@ </section> <section> <condition> - <not><if-empty field-name="contactDescription"/></not> + <not><if-empty field="contactDescription"/></not> </condition> <widgets> <container style="profile-left"> Modified: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml Sat Jan 31 23:56:33 2009 @@ -46,7 +46,7 @@ <container style="screenlet-body"> <section> <condition> - <not><if-empty field-name="partyList"/></not> + <not><if-empty field="partyList"/></not> </condition> <widgets> <include-form name="ListContacts" location="component://marketing/widget/sfa/forms/ContactForms.xml"/> @@ -122,7 +122,7 @@ <container style="screenlet-body"> <section> <condition> - <if-compare-field field-name="parameters.partyIdFrom" operator="not-equals" to-field-name="parameters.partyIdTo"/> + <if-compare-field field="parameters.partyIdFrom" operator="not-equals" to-field="parameters.partyIdTo"/> </condition> <widgets> <platform-specific> Modified: ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml Sat Jan 31 23:56:33 2009 @@ -32,7 +32,7 @@ <section> <widgets> <section> - <condition><not><if-empty field-name="salesForecastId"/></not></condition> + <condition><not><if-empty field="salesForecastId"/></not></condition> <widgets> <include-menu name="SalesForecastTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> </widgets> @@ -88,7 +88,7 @@ <set field="titleProperty" value="PageTitleEditSalesForecast"/> <set field="tabButtonItem" value="EditSalesForecast"/> <set field="salesForecastId" from-field="parameters.salesForecastId"/> - <entity-one entity-name="SalesForecast" value-name="salesForecast"/> + <entity-one entity-name="SalesForecast" value-field="salesForecast"/> </actions> <widgets> <decorator-screen name="CommonSalesForecastDecorator"> @@ -101,7 +101,7 @@ </container> <container style="screenlet-body"> <section> - <condition><not><if-empty field-name="salesForecastId"/></not></condition> + <condition><not><if-empty field="salesForecastId"/></not></condition> <widgets> <container style="button-bar"> <link target="EditSalesForecast" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.SfaSalesForecast}" style="buttontext"/> Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Sat Jan 31 23:56:33 2009 @@ -49,7 +49,7 @@ <section> <condition> <not> - <if-empty field-name="partyList"/> + <if-empty field="partyList"/> </not> </condition> <widgets> @@ -188,7 +188,7 @@ </container> <section> <condition> - <if-compare-field field-name="parameters.partyIdFrom" operator="not-equals" to-field-name="parameters.partyIdTo"/> + <if-compare-field field="parameters.partyIdFrom" operator="not-equals" to-field="parameters.partyIdTo"/> </condition> <widgets> <platform-specific> Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Sat Jan 31 23:56:33 2009 @@ -72,7 +72,7 @@ <set field="titleProperty" value="Opportunities"/> <set field="tabButtonItem" value="EditOpportunity"/> <set field="salesOpportunityId" from-field="parameters.salesOpportunityId"/> - <entity-one entity-name="SalesOpportunity" value-name="salesOpportunity"/> + <entity-one entity-name="SalesOpportunity" value-field="salesOpportunity"/> </actions> <widgets> <decorator-screen name="CommonOpportunityDecorator" location="${parameters.mainDecoratorLocation}"> @@ -103,7 +103,7 @@ <set field="titleProperty" value="Opportunities"/> <set field="tabButtonItem" value="ViewOpportunity"/> <set field="salesOpportunityId" from-field="parameters.salesOpportunityId"/> - <entity-one entity-name="SalesOpportunity" value-name="salesOpportunity"/> + <entity-one entity-name="SalesOpportunity" value-field="salesOpportunity"/> </actions> <widgets> <decorator-screen name="CommonOpportunityDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Sat Jan 31 23:56:33 2009 @@ -24,7 +24,7 @@ <form name="ListAccounts" type="list" list-name="partyList" paginate-target="FindAccount" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> - <entity-one entity-name="PartyGroup" value-name="partyGroup"/> + <entity-one entity-name="PartyGroup" value-field="partyGroup"/> </row-actions> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" target-type="inter-app"/> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Sat Jan 31 23:56:33 2009 @@ -24,11 +24,11 @@ <form name="ListContacts" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindContact" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <row-actions> - <entity-one entity-name="Person" value-name="person"> - <field-map field-name="partyId" env-name="partyRow.partyId"/> + <entity-one entity-name="Person" value-field="person"> + <field-map field-name="partyId" from-field="partyRow.partyId"/> </entity-one> - <entity-one entity-name="PartyType" value-name="partyType"> - <field-map field-name="partyTypeId" env-name="partyRow.partyTypeId"/> + <entity-one entity-name="PartyType" value-field="partyType"> + <field-map field-name="partyTypeId" from-field="partyRow.partyTypeId"/> </entity-one> </row-actions> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml Sat Jan 31 23:56:33 2009 @@ -29,8 +29,8 @@ <form name="SalesForecastSearchResults" type="list" list-name="listIt" paginate-target="FindForecasts" view-size="5" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2" separate-columns="true"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalesForecast"/> </service> </actions> @@ -80,7 +80,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <actions> <entity-condition entity-name="SalesForecastDetail"> - <condition-expr field-name="salesForecastId" env-name="parameters.salesForecastId"/> + <condition-expr field-name="salesForecastId" from-field="parameters.salesForecastId"/> </entity-condition> </actions> <auto-fields-entity entity-name="SalesForecastDetail" default-field-type="edit"/> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Sat Jan 31 23:56:33 2009 @@ -24,11 +24,11 @@ <form name="ListLeads" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindLead" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <row-actions> - <entity-one entity-name="Person" value-name="person"> - <field-map field-name="partyId" env-name="partyRow.partyId"/> + <entity-one entity-name="Person" value-field="person"> + <field-map field-name="partyId" from-field="partyRow.partyId"/> </entity-one> - <entity-one entity-name="PartyType" value-name="partyType"> - <field-map field-name="partyTypeId" env-name="partyRow.partyTypeId"/> + <entity-one entity-name="PartyType" value-field="partyType"> + <field-map field-name="partyTypeId" from-field="partyRow.partyTypeId"/> </entity-one> <set field="statusId" from-field="partyRow.statusId"/> </row-actions> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=739656&r1=739655&r2=739656&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Sat Jan 31 23:56:33 2009 @@ -46,8 +46,8 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <actions> <set field="parameters.noConditionFind" value="Y"/> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalesOpportunity"/> <field-map field-name="orderBy" value="salesOpportunityId"/> </service> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |