svn commit: r737833 - in /ofbiz/trunk/applications/ecom
Locked
 
|
Author: mrisaliti
Date: Mon Jan 26 20:46:50 2009 New Revision: 737833 URL: http://svn.apache.org/viewvc?rev=737833&view=rev Log: Artifact cleaning on ecommerce component after recent changes on xsd files (OFBIZ-2137) Modified: ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml ofbiz/trunk/applications/ecommerce/widget/ForumTrees.xml ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml Modified: ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml Mon Jan 26 20:46:50 2009 @@ -181,7 +181,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="productCategory"/></not> + <not><if-empty field="productCategory"/></not> </condition> <widgets> <include-screen name="${detailScreen}"/> @@ -202,8 +202,8 @@ <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy"/> - <entity-and entity-name="ProductCategoryLink" list-name="productCategoryLinks" use-cache="true" filter-by-date="true"> - <field-map field-name="productCategoryId" env-name="productCategoryId"/> + <entity-and entity-name="ProductCategoryLink" list="productCategoryLinks" use-cache="true" filter-by-date="true"> + <field-map field-name="productCategoryId" from-field="productCategoryId"/> <order-by field-name="sequenceNum"/> </entity-and> </actions> @@ -253,7 +253,7 @@ <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="product"/></not> + <not><if-empty field="product"/></not> </condition> <widgets> <include-screen name="${detailScreen}"/> Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Mon Jan 26 20:46:50 2009 @@ -292,15 +292,15 @@ <screen name="responseTreeLine"> <section> <actions> - <service service-name="getPublicForumMessage" result-map-name="contentData"> - <field-map field-name="contentId" env-name="rsp.contentId"/> + <service service-name="getPublicForumMessage" result-map="contentData"> + <field-map field-name="contentId" from-field="rsp.contentId"/> </service> <set field="textData" from-field="contentData.resultData.electronicText.textData"/> </actions> <widgets> <section> <condition> - <if-compare-field field-name="responseContentId" operator="equals" to-field-name="rsp.contentId" /> + <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId" /> </condition> <widgets> <container style="responseSelected"> Modified: ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml Mon Jan 26 20:46:50 2009 @@ -61,9 +61,9 @@ <set field="titleProperty" value="PageTitleViewProfile"/> <set field="partyId" from-field="userLogin.partyId"/> - <entity-one entity-name="Party" value-name="party"/> - <entity-one entity-name="Person" value-name="person"/> - <entity-one entity-name="PartyGroup" value-name="partyGroup"/> + <entity-one entity-name="Party" value-field="party"/> + <entity-one entity-name="Person" value-field="person"/> + <entity-one entity-name="PartyGroup" value-field="partyGroup"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy"/> </actions> @@ -263,17 +263,17 @@ <screen name="messagelist-include"> <section> <actions> - <entity-condition entity-name="CommunicationEvent" list-name="receivedCommunicationEvents"> - <condition-expr field-name="partyIdTo" operator="equals" env-name="userLogin.partyId"/> + <entity-condition entity-name="CommunicationEvent" list="receivedCommunicationEvents"> + <condition-expr field-name="partyIdTo" operator="equals" from-field="userLogin.partyId"/> <order-by field-name="-entryDate"/> </entity-condition> </actions> <widgets> <section> - <condition><if-compare field-name="parameters.showSent" operator="equals" value="true"/></condition> + <condition><if-compare field="parameters.showSent" operator="equals" value="true"/></condition> <actions> - <entity-condition entity-name="CommunicationEvent" list-name="sentCommunicationEvents"> - <condition-expr field-name="partyIdFrom" operator="equals" env-name="userLogin.partyId"/> + <entity-condition entity-name="CommunicationEvent" list="sentCommunicationEvents"> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="userLogin.partyId"/> <order-by field-name="-entryDate"/> </entity-condition> </actions> @@ -287,7 +287,7 @@ <section> <actions> <set field="titleProperty" value="PageTitleMessageDetail"/> - <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" auto-field-map="true"/> + <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -307,7 +307,7 @@ <set field="showMessageLinks" value="true"/> <set field="submitRequest" value="sendmessage"/> - <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" auto-field-map="true"/> + <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" auto-field-map="true"/> <set field="partyIdTo" from-field="communicationEvent.partyIdFrom"/> </actions> <widgets> @@ -325,15 +325,15 @@ <actions> <set field="titleProperty" value="PageTitleDigitalProductList"/> - <entity-and entity-name="SupplierProduct" list-name="supplierProductList"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <entity-and entity-name="SupplierProduct" list="supplierProductList"> + <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-and> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> - <condition><if-compare field-name="productStore.enableDigProdUpload" operator="equals" value="Y"/></condition> + <condition><if-compare field="productStore.enableDigProdUpload" operator="equals" value="Y"/></condition> <widgets> <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl"/></html></platform-specific> </widgets> @@ -352,32 +352,32 @@ <set field="titleProperty" value="PageTitleDigitalProductEdit"/> <set field="parameters.minimumOrderQuantity" value="1" type="BigDecimal"/> - <entity-one entity-name="SupplierProduct" value-name="supplierProduct" auto-field-map="false"> - <field-map field-name="partyId" env-name="userLogin.partyId"/><!-- get from userLogin for security reasons --> - <field-map field-name="productId" env-name="parameters.productId"/> - <field-map field-name="currencyUomId" env-name="parameters.currencyUomId"/> - <field-map field-name="minimumOrderQuantity" env-name="parameters.minimumOrderQuantity"/> - <field-map field-name="availableFromDate" env-name="parameters.availableFromDate"/> + <entity-one entity-name="SupplierProduct" value-field="supplierProduct" auto-field-map="false"> + <field-map field-name="partyId" from-field="userLogin.partyId"/><!-- get from userLogin for security reasons --> + <field-map field-name="productId" from-field="parameters.productId"/> + <field-map field-name="currencyUomId" from-field="parameters.currencyUomId"/> + <field-map field-name="minimumOrderQuantity" from-field="parameters.minimumOrderQuantity"/> + <field-map field-name="availableFromDate" from-field="parameters.availableFromDate"/> </entity-one> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <!-- should just be one, but don't have all pk fields so will just get first from list --> - <entity-and entity-name="ProductPrice" list-name="productPriceList"> - <field-map field-name="productId" env-name="parameters.productId"/> + <entity-and entity-name="ProductPrice" list="productPriceList"> + <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="productPriceTypeId" value="DEFAULT_PRICE"/> <field-map field-name="productPricePurposeId" value="PURCHASE"/> <field-map field-name="productStoreGroupId" value="_NA_"/> </entity-and> - <entity-condition entity-name="ProductContentAndInfo" list-name="productContentAndInfoList" filter-by-date="true"> + <entity-condition entity-name="ProductContentAndInfo" list="productContentAndInfoList" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="productId" env-name="parameters.productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <condition-expr field-name="productContentTypeId" value="DIGITAL_DOWNLOAD"/> </condition-list> <order-by field-name="contentId"/> </entity-condition> - <entity-and entity-name="ContentAndRole" list-name="ownerContentAndRoleList"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <entity-and entity-name="ContentAndRole" list="ownerContentAndRoleList"> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="roleTypeId" value="OWNER"/> <order-by field-name="contentId"/> </entity-and> @@ -386,7 +386,7 @@ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> - <condition><if-compare field-name="productStore.enableDigProdUpload" operator="equals" value="Y"/></condition> + <condition><if-compare field="productStore.enableDigProdUpload" operator="equals" value="Y"/></condition> <widgets> <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl"/></html></platform-specific> </widgets> @@ -404,39 +404,39 @@ <screen name="FinAccountList-include"> <section> <actions> - <entity-condition entity-name="FinAccount" list-name="ownedFinAccountList" filter-by-date="true"> + <entity-condition entity-name="FinAccount" list="ownedFinAccountList" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="ownerPartyId" operator="equals" env-name="userLogin.partyId"/> - <condition-expr field-name="organizationPartyId" operator="equals" env-name="productStore.payToPartyId"/> + <condition-expr field-name="ownerPartyId" operator="equals" from-field="userLogin.partyId"/> + <condition-expr field-name="organizationPartyId" operator="equals" from-field="productStore.payToPartyId"/> </condition-list> <order-by field-name="-fromDate"/> </entity-condition> </actions> <widgets> <section> - <condition><not><if-empty field-name="ownedFinAccountList"/></not></condition> + <condition><not><if-empty field="ownedFinAccountList"/></not></condition> <widgets> <container id="fin-account-list" style="screenlet"> <container style="screenlet-header"> <label style="boxhead" text="My Accounts"/> </container> <container style="screenlet-body"> - <iterate-section entry-name="ownedFinAccount" list-name="ownedFinAccountList"> + <iterate-section entry="ownedFinAccount" list="ownedFinAccountList"> <section> <actions> - <entity-condition entity-name="FinAccountTrans" list-name="ownedFinAccountTransList"> - <condition-expr field-name="finAccountId" env-name="ownedFinAccount.finAccountId"/> + <entity-condition entity-name="FinAccountTrans" list="ownedFinAccountTransList"> + <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/> <order-by field-name="transactionDate"/> </entity-condition> - <entity-condition entity-name="FinAccountAuth" list-name="ownedFinAccountAuthList" filter-by-date="true"> - <condition-expr field-name="finAccountId" env-name="ownedFinAccount.finAccountId"/> + <entity-condition entity-name="FinAccountAuth" list="ownedFinAccountAuthList" filter-by-date="true"> + <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/> <order-by field-name="authorizationDate"/> </entity-condition> - <entity-one entity-name="StatusItem" value-name="finAccountStatusItem"> - <field-map field-name="statusId" env-name="ownedFinAccount.statusId"/> + <entity-one entity-name="StatusItem" value-field="finAccountStatusItem"> + <field-map field-name="statusId" from-field="ownedFinAccount.statusId"/> </entity-one> - <entity-one entity-name="Uom" value-name="accountCurrencyUom" auto-field-map="false" use-cache="true"> - <field-map field-name="uomId" env-name="ownedFinAccount.currencyUomId"/> + <entity-one entity-name="Uom" value-field="accountCurrencyUom" auto-field-map="false" use-cache="true"> + <field-map field-name="uomId" from-field="ownedFinAccount.currencyUomId"/> </entity-one> </actions> <widgets> @@ -458,10 +458,10 @@ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-condition entity-name="InventoryItem" list-name="inventoryItemList"> + <entity-condition entity-name="InventoryItem" list="inventoryItemList"> <condition-list> <condition-expr field-name="inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"/> - <condition-expr field-name="ownerPartyId" operator="equals" env-name="userLogin.partyId"/> + <condition-expr field-name="ownerPartyId" operator="equals" from-field="userLogin.partyId"/> </condition-list> <order-by field-name="-createdStamp"/> </entity-condition> @@ -470,7 +470,7 @@ <section> <condition> <not> - <if-empty field-name="inventoryItemList"/> + <if-empty field="inventoryItemList"/> </not> </condition> <widgets> @@ -491,9 +491,9 @@ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-condition entity-name="Subscription" list-name="subscriptionList" filter-by-date="true"> + <entity-condition entity-name="Subscription" list="subscriptionList" filter-by-date="true"> <condition-list> - <condition-expr field-name="partyId" operator="equals" env-name="userLogin.partyId"/> + <condition-expr field-name="partyId" operator="equals" from-field="userLogin.partyId"/> </condition-list> <order-by field-name="-fromDate"/> </entity-condition> @@ -502,7 +502,7 @@ <section> <condition> <not> - <if-empty field-name="subscriptionList"/> + <if-empty field="subscriptionList"/> </not> </condition> <widgets> @@ -542,9 +542,9 @@ <actions> <set field="titleProperty" value="PageTitleViewProfile"/> <set field="partyId" from-field="userLogin.partyId"/> - <entity-one entity-name="Party" value-name="party"/> - <entity-one entity-name="Person" value-name="person"/> - <entity-one entity-name="PartyGroup" value-name="partyGroup"/> + <entity-one entity-name="Party" value-field="party"/> + <entity-one entity-name="Person" value-field="person"/> + <entity-one entity-name="PartyGroup" value-field="partyGroup"/> <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/controls.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/profile.js" global="true"/> Modified: ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml Mon Jan 26 20:46:50 2009 @@ -27,8 +27,8 @@ <set field="title" value="Subscription Verify Email"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> - <entity-one entity-name="PartyNameView" value-name="partyName" auto-field-map="false"> - <field-map field-name="partyId" env-name="contactListParty.partyId"/> + <entity-one entity-name="PartyNameView" value-field="partyName" auto-field-map="false"> + <field-map field-name="partyId" from-field="contactListParty.partyId"/> </entity-one> </actions> <widgets> Modified: ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml Mon Jan 26 20:46:50 2009 @@ -25,16 +25,16 @@ <screen name="forums"> <section> <actions> - <entity-condition entity-name="ContentAssocViewTo" list-name="forums" use-cache="true"> + <entity-condition entity-name="ContentAssocViewTo" list="forums" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="contentIdStart" operator="equals" value="WebStoreFORUM"/> <condition-list combine="or"> - <condition-expr field-name="caFromDate" operator="equals" env-name="null"/> - <condition-expr field-name="caFromDate" operator="less-equals" env-name="nowTimestamp"/> + <condition-expr field-name="caFromDate" operator="equals" from-field="null"/> + <condition-expr field-name="caFromDate" operator="less-equals" from-field="nowTimestamp"/> </condition-list> <condition-list combine="or"> - <condition-expr field-name="caThruDate" operator="equals" env-name="null"/> - <condition-expr field-name="caThruDate" operator="greater-equals" env-name="nowTimestamp"/> + <condition-expr field-name="caThruDate" operator="equals" from-field="null"/> + <condition-expr field-name="caThruDate" operator="greater-equals" from-field="nowTimestamp"/> </condition-list> </condition-list> <order-by field-name="contentName"/> @@ -57,16 +57,16 @@ <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleForumSummary"/> - <entity-one entity-name="Content" value-name="forum"> - <field-map field-name="contentId" env-name="parameters.forumId"/> + <entity-one entity-name="Content" value-field="forum"> + <field-map field-name="contentId" from-field="parameters.forumId"/> </entity-one> <!-- parameters for the performFind service --> <set field="parameters.forumId" from-field="parameters.forumId" default-value="${parameters.contentId}"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/> - <entity-condition list-name="forumMessages" entity-name="ContentAssocViewTo" > + <entity-condition list="forumMessages" entity-name="ContentAssocViewTo" > <condition-list combine="and"> - <condition-expr field-name="contentIdStart" env-name="parameters.forumId" /> + <condition-expr field-name="contentIdStart" from-field="parameters.forumId" /> <condition-list combine="or"> <condition-expr field-name="caContentAssocTypeId" value="PUBLISH_LINK"/> <condition-expr field-name="caContentAssocTypeId" value="RESPONSE"/> @@ -110,14 +110,14 @@ <set field="contentAssoc.contentId" from-field="parameters.responseContentId"/> <set field="contentAssoc.contentAssocTypeId" value="RESPONSE"/> - <entity-one entity-name="Content" value-name="content"> - <field-map field-name="contentId" env-name="parameters.responseContentId"/> + <entity-one entity-name="Content" value-field="content"> + <field-map field-name="contentId" from-field="parameters.responseContentId"/> </entity-one> - <entity-one entity-name="ElectronicText" value-name="electronicText"> - <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> + <entity-one entity-name="ElectronicText" value-field="electronicText"> + <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> - <!-- service service-name="getContentAndDataResource" result-map-name="contentData"> - <field-map field-name="contentId" env-name="parameters.responseContentId"/> + <!-- service service-name="getContentAndDataResource" result-map="contentData"> + <field-map field-name="contentId" from-field="parameters.responseContentId"/> </service --> <set field="contentText" from-field="electronicText.textData"/> </actions> @@ -528,7 +528,7 @@ <section> <condition> <not> - <if-empty field-name="rsp.contentName"/> + <if-empty field="rsp.contentName"/> </not> </condition> <actions> @@ -536,7 +536,7 @@ <widgets> <section> <condition> - <if-compare-field field-name="responseContentId" operator="equals" to-field-name="rsp.contentId" /> + <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId" /> </condition> <widgets> <container style="responseSelected"> Modified: ofbiz/trunk/applications/ecommerce/widget/ForumTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ForumTrees.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/ForumTrees.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/ForumTrees.xml Mon Jan 26 20:46:50 2009 @@ -24,19 +24,19 @@ <tree name="ResponseTree" root-node-name="node-root" default-render-style="simple" default-wrap-style="responseTreeWrapper"> <node name="node-root" > - <entity-one entity-name="Content" use-cache="false" value-name="rsp"> - <field-map field-name="contentId" env-name="parameters.threadContentId"/> + <entity-one entity-name="Content" use-cache="false" value-field="rsp"> + <field-map field-name="contentId" from-field="parameters.threadContentId"/> </entity-one> <include-screen name="responseTreeLine" location="component://ecommerce/widget/ForumScreens.xml" /> <sub-node node-name="node-body"> <entity-condition entity-name="ContentAssocViewTo" use-cache="false" > <condition-list combine="and"> - <condition-expr field-name="contentIdStart" operator="equals" env-name="rsp.contentId" /> + <condition-expr field-name="contentIdStart" operator="equals" from-field="rsp.contentId" /> <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE" /> - <condition-expr field-name="caFromDate" operator="less-equals" env-name="nowTimestamp" /> + <condition-expr field-name="caFromDate" operator="less-equals" from-field="nowTimestamp" /> <condition-list combine="or"> <condition-expr field-name="caThruDate" operator="equals" /> - <condition-expr field-name="caThruDate" operator="greater" env-name="nowTimestamp" /> + <condition-expr field-name="caThruDate" operator="greater" from-field="nowTimestamp" /> </condition-list> </condition-list> <order-by field-name="caFromDate DESC"/> @@ -48,12 +48,12 @@ <sub-node node-name="node-body"> <entity-condition entity-name="ContentAssocViewTo" use-cache="true" > <condition-list combine="and"> - <condition-expr field-name="contentIdStart" operator="equals" env-name="rsp.contentId" /> + <condition-expr field-name="contentIdStart" operator="equals" from-field="rsp.contentId" /> <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE" /> - <condition-expr field-name="caFromDate" operator="less-equals" env-name="nowTimestamp" /> + <condition-expr field-name="caFromDate" operator="less-equals" from-field="nowTimestamp" /> <condition-list combine="or"> <condition-expr field-name="caThruDate" operator="equals" /> - <condition-expr field-name="caThruDate" operator="greater" env-name="nowTimestamp" /> + <condition-expr field-name="caThruDate" operator="greater" from-field="nowTimestamp" /> </condition-list> </condition-list> <order-by field-name="caFromDate DESC"/> Modified: ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/QuoteScreens.xml Mon Jan 26 20:46:50 2009 @@ -28,9 +28,9 @@ <set field="titleProperty" value="PageTitleListQuotes"/> <!--<set field="headerItem" value="Shopping List"/>--> - <entity-condition entity-name="Quote" list-name="quoteList"> + <entity-condition entity-name="Quote" list="quoteList"> <condition-list combine="and"> - <condition-expr field-name="partyId" env-name="userLogin.partyId"/> + <condition-expr field-name="partyId" from-field="userLogin.partyId"/> <condition-expr field-name="statusId" operator="not-equals" value="QUO_CREATED"/> </condition-list> <order-by field-name="-validFromDate"/> @@ -56,15 +56,15 @@ <set field="titleProperty" value="PageTitleViewQuote"/> <!--<set field="headerItem" value="Shopping List"/>--> <set field="quoteId" from-field="parameters.quoteId"/> - <entity-one entity-name="Quote" value-name="quote"/> - <get-related-one value-name="quote" relation-name="QuoteType" to-value-name="quoteType"/> - <get-related-one value-name="quote" relation-name="StatusItem" to-value-name="statusItem"/> - <get-related-one value-name="quote" relation-name="Uom" to-value-name="currency"/> - <get-related-one value-name="quote" relation-name="ProductStore" to-value-name="store"/> + <entity-one entity-name="Quote" value-field="quote"/> + <get-related-one value-field="quote" relation-name="QuoteType" to-value-field="quoteType"/> + <get-related-one value-field="quote" relation-name="StatusItem" to-value-field="statusItem"/> + <get-related-one value-field="quote" relation-name="Uom" to-value-field="currency"/> + <get-related-one value-field="quote" relation-name="ProductStore" to-value-field="store"/> - <get-related value-name="quote" relation-name="QuoteItem" list-name="quoteItems"/> - <get-related value-name="quote" relation-name="QuoteAdjustment" list-name="quoteAdjustments"/> - <get-related value-name="quote" relation-name="QuoteRole" list-name="quoteRoles"/> + <get-related value-field="quote" relation-name="QuoteItem" list="quoteItems"/> + <get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/> + <get-related value-field="quote" relation-name="QuoteRole" list="quoteRoles"/> </actions> <widgets> Modified: ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/RequestScreens.xml Mon Jan 26 20:46:50 2009 @@ -40,9 +40,9 @@ <set field="titleProperty" value="PageTitleListRequests"/> <!--<set field="headerItem" value="Shopping List"/>--> - <entity-condition entity-name="CustRequest" list-name="requestList"> + <entity-condition entity-name="CustRequest" list="requestList"> <condition-list combine="and"> - <condition-expr field-name="fromPartyId" env-name="userLogin.partyId"/> + <condition-expr field-name="fromPartyId" from-field="userLogin.partyId"/> <!--<condition-expr field-name="statusId" operator="not-equals" value="QUO_CREATED"/>--> </condition-list> <order-by field-name="-custRequestDate"/> @@ -68,14 +68,14 @@ <set field="titleProperty" value="PageTitleViewRequest"/> <!--<set field="headerItem" value="Shopping List"/>--> <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> - <get-related-one value-name="custRequest" relation-name="CustRequestType" to-value-name="custRequestType"/> - <get-related-one value-name="custRequest" relation-name="StatusItem" to-value-name="statusItem"/> - <get-related-one value-name="custRequest" relation-name="CurrencyUom" to-value-name="currency"/> - <get-related-one value-name="custRequest" relation-name="ProductStore" to-value-name="store"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <get-related-one value-field="custRequest" relation-name="CustRequestType" to-value-field="custRequestType"/> + <get-related-one value-field="custRequest" relation-name="StatusItem" to-value-field="statusItem"/> + <get-related-one value-field="custRequest" relation-name="CurrencyUom" to-value-field="currency"/> + <get-related-one value-field="custRequest" relation-name="ProductStore" to-value-field="store"/> - <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="requestItems"/> - <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="requestParties"/> + <get-related value-field="custRequest" relation-name="CustRequestItem" list="requestItems"/> + <get-related value-field="custRequest" relation-name="CustRequestParty" list="requestParties"/> </actions> <widgets> Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml Mon Jan 26 20:46:50 2009 @@ -60,9 +60,9 @@ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" paginate-target="/CMSContentFind" view-size="20"> <actions> - <service service-name="performFind" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="requestParameters"/> - <field-map field-name="entityName" env-name="entityName"/> + <service service-name="performFind" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> + <field-map field-name="entityName" from-field="entityName"/> </service> </actions> Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml Mon Jan 26 20:46:50 2009 @@ -25,12 +25,12 @@ <section> <condition> <not> - <if-empty field-name="parameters.blogContentId"/> + <if-empty field="parameters.blogContentId"/> </not> </condition> <actions> - <entity-one entity-name="Content" value-name="blogContent"> - <field-map field-name="contentId" env-name="parameters.blogContentId"/> + <entity-one entity-name="Content" value-field="blogContent"> + <field-map field-name="contentId" from-field="parameters.blogContentId"/> </entity-one> <!-- permission fields --> @@ -70,9 +70,9 @@ <actions> <set field="MainColumnStyle" value="nocolumns"/> <set field="blogContentId" from-field="parameters.blogContentId"/> - <entity-condition entity-name="ContentAssocViewTo" use-cache="false" list-name="blogList"> + <entity-condition entity-name="ContentAssocViewTo" use-cache="false" list="blogList"> <condition-list combine="and"> - <condition-expr field-name="contentIdStart" operator="equals" env-name="blogContentId"/> + <condition-expr field-name="contentIdStart" operator="equals" from-field="blogContentId"/> <condition-expr field-name="caContentAssocTypeId" operator="equals" value="PUBLISH_LINK"/> <condition-expr field-name="caThruDate" operator="equals" value=""/> <condition-expr field-name="statusId" operator="equals" value="CTNT_PUBLISHED"/> @@ -92,9 +92,9 @@ <if-service-permission service-name="genericContentPermission" main-action="UPDATE" context-map="upPerm"/> </condition> <actions> - <service service-name="getOwnedOrPublishedBlogEntries" result-map-name="result"> - <field-map field-name="contentId" env-name="blogContentId"/> - <field-map field-name="userLogin" env-name="userLogin"/> + <service service-name="getOwnedOrPublishedBlogEntries" result-map="result"> + <field-map field-name="contentId" from-field="blogContentId"/> + <field-map field-name="userLogin" from-field="userLogin"/> </service> <set field="blogList" from-field="result.blogList" default-value="${blogList}"/> </actions> @@ -102,10 +102,10 @@ </section> <decorator-screen name="CommonBlog" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <iterate-section list-name="blogList" entry-name="blog" paginate="true" paginate-target="MainBlog"> + <iterate-section list="blogList" entry="blog" paginate="true" paginate-target="MainBlog"> <section name="firstBlog"> <condition> - <if-compare field-name="itemIndex" operator="equals" type="Integer" value="0"/> + <if-compare field="itemIndex" operator="equals" type="Integer" value="0"/> </condition> <widgets> <container style="blogwrapper"> @@ -124,7 +124,7 @@ </section> <section name="allOtherBlogs"> <condition> - <if-compare field-name="itemIndex" operator="greater" type="Integer" value="0"/> + <if-compare field="itemIndex" operator="greater" type="Integer" value="0"/> </condition> <widgets> <container style="blogwrapper"> @@ -191,7 +191,7 @@ <if-service-permission service-name="genericContentPermission" main-action="UPDATE"/> </condition--> <actions> - <service service-name="getBlogEntry" result-map-name="blogEntry" auto-field-map="true"/> + <service service-name="getBlogEntry" result-map="blogEntry" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="CommonBlog" location="${parameters.mainDecoratorLocation}"> @@ -215,8 +215,8 @@ <set field="articleContentId" from-field="parameters.articleContentId" default-value="${parameters.contentId}"/> <set field="ownerContentId" from-field="parameters.ownerContentId"/> <set field="blogContentId" from-field="parameters.blogContentId"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"> - <field-map field-name="contentId" env-name="articleContentId"/> + <entity-one entity-name="Content" value-field="content" use-cache="true"> + <field-map field-name="contentId" from-field="articleContentId"/> </entity-one> <set field="enableEdit" value="false"/> <property-to-field property="root.publish.point.blog" field="webPutPt" resource="blog"/> @@ -277,11 +277,11 @@ <set field="articleContentId" from-field="parameters.articleContentId"/> <set field="ownerContentId" from-field="parameters.ownerContentId"/> <set field="blogContentId" from-field="parameters.blogContentId"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"> - <field-map field-name="contentId" env-name="contentId"/> + <entity-one entity-name="Content" value-field="content" use-cache="true"> + <field-map field-name="contentId" from-field="contentId"/> </entity-one> - <entity-one entity-name="Content" value-name="article"> - <field-map field-name="contentId" env-name="articleContentId"/> + <entity-one entity-name="Content" value-field="article"> + <field-map field-name="contentId" from-field="articleContentId"/> </entity-one> <set field="trail" from-field="articleContentId"/> @@ -303,13 +303,13 @@ <!-- <if-service-permission service-name="genericContentPermission" main-action="UPDATE"/> --> - <if-empty field-name="foobar"/> + <if-empty field="foobar"/> </condition> <widgets> <container style="rightjustify"> <section> <condition> - <if-compare field-name="parameters.edit" operator="not-equals" value="Y"/> + <if-compare field="parameters.edit" operator="not-equals" value="Y"/> </condition> <widgets> <link text="Edit" target="ViewResponse?contentId=${content.contentId}&ownerContentId=${content.ownerContentId}&articleContentId=${articleContentId}&blogContentId=${blogContentId}&edit=Y" style="buttontext"/> @@ -339,10 +339,10 @@ <section> <condition> <or> - <if-compare field-name="content.statusId" operator="equals" value="CTNT_INITIAL_DRAFT"/> + <if-compare field="content.statusId" operator="equals" value="CTNT_INITIAL_DRAFT"/> <and> <if-entity-permission entity-id="${content.contentId}" entity-name="Content" target-operation="CONTENT_UPDATE"/> - <if-compare field-name="parameters.edit" operator="equals" value="Y"/> + <if-compare field="parameters.edit" operator="equals" value="Y"/> </and> </or> @@ -364,7 +364,7 @@ <section> <condition> <not> - <if-empty field-name="contentId"/> + <if-empty field="contentId"/> </not> </condition> <actions/> @@ -393,7 +393,7 @@ <screen name="BlogResponses"> <section> <actions> - <entity-condition entity-name="ContentAssocViewTo" use-cache="true" list-name="responseList"> + <entity-condition entity-name="ContentAssocViewTo" use-cache="true" list="responseList"> <condition-list combine="and"> <condition-expr field-name="caContentId" operator="equals" value="${articleContentId}"/> <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/> @@ -408,7 +408,7 @@ <container style="bloghr"> <label text="Comments: " style="blogtitle"/> </container> - <iterate-section list-name="responseList" entry-name="rsp" view-size="10"> + <iterate-section list="responseList" entry="rsp" view-size="10"> <section name="Blog Responses"> <widgets> <include-screen name="responseTreeLine"/> @@ -422,7 +422,7 @@ <screen name="LatestResponses"> <section> <actions> - <entity-condition entity-name="ContentAssocDataResourceViewTo" use-cache="false" list-name="responseList"> + <entity-condition entity-name="ContentAssocDataResourceViewTo" use-cache="false" list="responseList"> <condition-list combine="and"> <condition-expr field-name="ownerContentId" operator="equals" value="${parameters.ownerContentId}"/> <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/> @@ -436,7 +436,7 @@ <decorator-screen name="CommonBlog" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <label text="Latest Responses"/> - <iterate-section list-name="responseList" entry-name="rsp"> + <iterate-section list="responseList" entry="rsp"> <section name="Blog Responses"> <widgets> <include-screen name="responseTreeLine"/> @@ -454,7 +454,7 @@ <widgets> <section> <condition> - <if-compare-field field-name="responseContentId" operator="not-equals" to-field-name="rsp.contentId"/> + <if-compare-field field="responseContentId" operator="not-equals" to-field="rsp.contentId"/> </condition> <widgets> <container> @@ -469,7 +469,7 @@ </section> <section> <condition> - <if-compare-field field-name="responseContentId" operator="equals" to-field-name="rsp.contentId"/> + <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId"/> </condition> <widgets> <container style="responseSelected"> @@ -506,7 +506,7 @@ <widgets> <section> <condition> - <if-empty field-name="parameters.contentId"/> + <if-empty field="parameters.contentId"/> </condition> <actions> <set field="rsp.contentIdFrom" from-field="parameters.articleContentId"/> @@ -516,7 +516,7 @@ <section> <condition> <not> - <if-empty field-name="parameters.contentId"/> + <if-empty field="parameters.contentId"/> </not> </condition> <actions> @@ -560,7 +560,7 @@ </container> <section> <condition> - <if-compare field-name="displayForm" operator="equals" value="Y"/> + <if-compare field="displayForm" operator="equals" value="Y"/> </condition> <widgets> <container style="blogcontentwrapper"> @@ -597,11 +597,11 @@ --> <actions> <set field="rsp.articleContentId" from-field="articleContentId"/> - <entity-one entity-name="DataResource" value-name="dataResource" use-cache="false"> - <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> + <entity-one entity-name="DataResource" value-field="dataResource" use-cache="false"> + <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> - <entity-one entity-name="ElectronicText" value-name="electronicText" use-cache="false"> - <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> + <entity-one entity-name="ElectronicText" value-field="electronicText" use-cache="false"> + <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> </actions> <widgets> @@ -621,16 +621,16 @@ <screen name="blogs"> <section> <actions> - <entity-condition entity-name="ContentAssocViewTo" list-name="blogs" use-cache="true"> + <entity-condition entity-name="ContentAssocViewTo" list="blogs" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="contentIdStart" operator="equals" value="BLOGROOT"/> <condition-list combine="or"> - <condition-expr field-name="caFromDate" operator="equals" env-name="null"/> - <condition-expr field-name="caFromDate" operator="less-equals" env-name="nowTimestamp"/> + <condition-expr field-name="caFromDate" operator="equals" from-field="null"/> + <condition-expr field-name="caFromDate" operator="less-equals" from-field="nowTimestamp"/> </condition-list> <condition-list combine="or"> - <condition-expr field-name="caThruDate" operator="equals" env-name="null"/> - <condition-expr field-name="caThruDate" operator="greater-equals" env-name="nowTimestamp"/> + <condition-expr field-name="caThruDate" operator="equals" from-field="null"/> + <condition-expr field-name="caThruDate" operator="greater-equals" from-field="nowTimestamp"/> </condition-list> </condition-list> <order-by field-name="contentName"/> Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml?rev=737833&r1=737832&r2=737833&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml Mon Jan 26 20:46:50 2009 @@ -21,14 +21,14 @@ <trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd"> <tree name="ResponseTree" root-node-name="node-root" default-render-style="simple" default-wrap-style="responseTreeWrapper"> <node name="node-root" entry-name="rsp"> - <entity-one entity-name="Content" use-cache="false" value-name="rsp"> - <field-map field-name="contentId" env-name="rootEntityId"/> + <entity-one entity-name="Content" use-cache="false" value-field="rsp"> + <field-map field-name="contentId" from-field="rootEntityId"/> </entity-one> <include-screen name="blogTreeLine" location="component://ecommerce/widget/blog/BlogScreens.xml"/> <sub-node node-name="node-body"> <entity-condition entity-name="ContentAssocViewTo" use-cache="false"> <condition-list combine="and"> - <condition-expr field-name="caContentId" operator="equals" env-name="rootEntityId"/> + <condition-expr field-name="caContentId" operator="equals" from-field="rootEntityId"/> <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/> <condition-expr field-name="caThruDate" operator="equals" value=""/> </condition-list> @@ -41,7 +41,7 @@ <sub-node node-name="node-body"> <entity-condition entity-name="ContentAssocViewTo" use-cache="true"> <condition-list combine="and"> - <condition-expr field-name="caContentId" operator="equals" env-name="rsp.contentId"/> + <condition-expr field-name="caContentId" operator="equals" from-field="rsp.contentId"/> <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/> <condition-expr field-name="caThruDate" operator="equals" value=""/> </condition-list> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |