svn commit: r739732 [1/3] - in /ofbiz/trunk: applications/content/widget/ applications/content/widget/cm
Locked
svn commit: r739732 [1/3] - in /ofbiz/trunk: applications/content/widget/ applications/content/widget/cm
 
|
Author: jleroux
Date: Sun Feb 1 10:27:43 2009 New Revision: 739732 URL: http://svn.apache.org/viewvc?rev=739732&view=rev Log: <entity-one entity-name=(.*)value-name => <entity-one entity-name=$1value-field Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml ofbiz/trunk/applications/content/widget/WebSiteScreens.xml ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/content/widget/content/ContentScreens.xml ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/common/widget/PortalPageScreens.xml ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml ofbiz/trunk/framework/exampleext/widget/example/ExampleScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetScreens.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Sun Feb 1 10:27:43 2009 @@ -98,7 +98,7 @@ <set field="labelTitleProperty" value="PageTitleEditSurvey"/> <set field="surveyId" from-field="parameters.surveyId"/> - <entity-one entity-name="Survey" value-name="survey"/> + <entity-one entity-name="Survey" value-field="survey"/> </actions> <widgets> <decorator-screen name="CommonSurveyDecorator"> @@ -154,7 +154,7 @@ <set field="labelTitleProperty" value="PageTitleEditSurveyMultiResps"/> <set field="surveyId" from-field="parameters.surveyId"/> - <entity-one entity-name="Survey" value-name="survey"/> + <entity-one entity-name="Survey" value-field="survey"/> <entity-condition entity-name="SurveyMultiResp" list-name="surveyMultiRespList"> <condition-expr field-name="surveyId" env-name="surveyId"/> <order-by field-name="surveyMultiRespId"/> @@ -227,7 +227,7 @@ <set field="labelTitleProperty" value="PageTitleEditSurveyQuestions"/> <set field="surveyId" from-field="parameters.surveyId"/> - <entity-one entity-name="Survey" value-name="survey"/> + <entity-one entity-name="Survey" value-field="survey"/> <script location="component://content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy"/> </actions> @@ -263,7 +263,7 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> <set field="surveyId" from-field="parameters.surveyId"/> - <entity-one entity-name="Survey" value-name="survey"/> + <entity-one entity-name="Survey" value-field="survey"/> </actions> <widgets> <decorator-screen name="CommonSurveyDecorator"> @@ -324,7 +324,7 @@ <set field="labelTitleProperty" value="PageTitleViewSurveyResponses"/> <set field="surveyId" from-field="parameters.surveyId"/> - <entity-one entity-name="Survey" value-name="survey"/> + <entity-one entity-name="Survey" value-field="survey"/> <script location="component://content/webapp/content/WEB-INF/actions/survey/ViewSurveyResponses.groovy"/> </actions> @@ -363,10 +363,10 @@ <set field="labelTitleProperty" value="PageTitleEditSurveyResponse"/> <set field="surveyId" from-field="parameters.surveyId"/> - <entity-one entity-name="Survey" value-name="survey"/> + <entity-one entity-name="Survey" value-field="survey"/> <set field="surveyResponseId" from-field="parameters.surveyResponseId"/> - <entity-one entity-name="SurveyResponse" value-name="surveyResponse"/> + <entity-one entity-name="SurveyResponse" value-field="surveyResponse"/> <script location="component://content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy"/> </actions> <widgets> Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sun Feb 1 10:27:43 2009 @@ -72,7 +72,7 @@ <set field="tabButtonItem" value="EditWebSite"/> <set field="labelTitleProperty" value="PageTitleEditWebSite"/> <set field="webSiteId" from-field="parameters.webSiteId"/> - <entity-one entity-name="WebSite" value-name="webSite"/> + <entity-one entity-name="WebSite" value-field="webSite"/> </actions> <widgets> <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}"> @@ -108,7 +108,7 @@ <set field="tabButtonItem" value="ListWebSiteContent"/> <set field="labelTitleProperty" value="PageTitleEditWebSiteContent"/> <set field="webSiteId" from-field="parameters.webSiteId"/> - <entity-one entity-name="WebSite" value-name="webSite"/> + <entity-one entity-name="WebSite" value-field="webSite"/> <entity-and entity-name="WebSiteContent" list-name="webSiteContent"> <field-map field-name="webSiteId" env-name="webSiteId"/> </entity-and> @@ -176,7 +176,7 @@ <set field="labelTitleProperty" value="PageTitleEditWebSiteParties"/> <set field="webSiteId" from-field="parameters.webSiteId"/> <property-map map-name="uiLabelMap" resource="PartyUiLabels"/> - <entity-one entity-name="WebSite" value-name="webSite"/> + <entity-one entity-name="WebSite" value-field="webSite"/> <script location="component://content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy"/> </actions> <widgets> @@ -204,7 +204,7 @@ <set field="tabButtonItem" value="WebSiteCMS"/> <set field="labelTitleProperty" value="PageTitleEditWebSiteCMS"/> <set field="webSiteId" from-field="parameters.webSiteId"/> - <entity-one entity-name="WebSite" value-name="webSite"/> + <entity-one entity-name="WebSite" value-field="webSite"/> <script location="component://content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy"/> </actions> @@ -241,7 +241,7 @@ <section> <actions> <set field="webSiteId" from-field="parameters.webSiteId"/> - <entity-one entity-name="WebSite" value-name="webSite"/> + <entity-one entity-name="WebSite" value-field="webSite"/> <script location="component://content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy"/> </actions> @@ -281,15 +281,15 @@ <set field="webSiteId" from-field="parameters.webSiteId"/> <set field="contentId" from-field="parameters.contentId"/> <set field="mimeTypeId" value="text/html"/> - <entity-one entity-name="WebSite" value-name="webSite"/> - <entity-one entity-name="Content" value-name="content"/> - <entity-one entity-name="DataResource" value-name="dataResource"> + <entity-one entity-name="WebSite" value-field="webSite"/> + <entity-one entity-name="Content" value-field="content"/> + <entity-one entity-name="DataResource" value-field="dataResource"> <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> </entity-one> - <entity-one entity-name="ElectronicText" value-name="dataText"> + <entity-one entity-name="ElectronicText" value-field="dataText"> <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> </entity-one> - <entity-one entity-name="ContentAssoc" value-name="assoc"> + <entity-one entity-name="ContentAssoc" value-field="assoc"> <field-map field-name="contentId" env-name="parameters.contentIdFrom"/> <field-map field-name="contentIdTo" env-name="parameters.contentId"/> <field-map field-name="contentAssocTypeId" env-name="parameters.contentAssocTypeId"/> @@ -334,12 +334,12 @@ <set field="webSiteId" from-field="parameters.webSiteId"/> <set field="contentId" from-field="parameters.contentId"/> <set field="mimeTypeId" value="text/html"/> - <entity-one entity-name="WebSite" value-name="webSite"/> - <entity-one entity-name="Content" value-name="content"/> - <entity-one entity-name="DataResource" value-name="dataResource"> + <entity-one entity-name="WebSite" value-field="webSite"/> + <entity-one entity-name="Content" value-field="content"/> + <entity-one entity-name="DataResource" value-field="dataResource"> <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> </entity-one> - <entity-one entity-name="ElectronicText" value-name="dataText"> + <entity-one entity-name="ElectronicText" value-field="dataText"> <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> </entity-one> </actions> @@ -358,7 +358,7 @@ <actions> <set field="webSiteId" from-field="parameters.webSiteId"/> <set field="contentId" from-field="parameters.contentId"/> - <entity-one entity-name="Content" value-name="content"/> + <entity-one entity-name="Content" value-field="content"/> <script location="component://content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy"/> </actions> @@ -377,8 +377,8 @@ <actions> <set field="webSiteId" from-field="parameters.webSiteId"/> <set field="contentId" from-field="parameters.contentId"/> - <entity-one entity-name="WebSite" value-name="webSite"/> - <entity-one entity-name="Content" value-name="content"/> + <entity-one entity-name="WebSite" value-field="webSite"/> + <entity-one entity-name="Content" value-field="content"/> <entity-and entity-name="WebSitePathAlias" list-name="aliases"> <field-map field-name="webSiteId" env-name="webSiteId"/> <field-map field-name="contentId" env-name="contentId"/> @@ -398,7 +398,7 @@ <actions> <set field="titleProperty" value="ContentPathAlias"/> <set field="webSiteId" from-field="parameters.webSiteId"/> - <entity-one entity-name="WebSite" value-name="webSite"/> + <entity-one entity-name="WebSite" value-field="webSite"/> <set field="tabButtonItem" value="PathAlias"/> <entity-and entity-name="WebSitePathAlias" list-name="aliases"> <field-map field-name="webSiteId" env-name="parameters.webSiteId"/> Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Sun Feb 1 10:27:43 2009 @@ -62,10 +62,10 @@ <actions> <script location="component://content/widget/GetMenuContext.groovy"/> <set field="titleProperty" value="PageTitleEditCMSContent"/> - <entity-one entity-name="Content" value-name="currentValue"> + <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" env-name="parameters.contentId"/> </entity-one> - <entity-one entity-name="ElectronicText" value-name="electronicText"> + <entity-one entity-name="ElectronicText" value-field="electronicText"> <field-map field-name="dataResourceId" env-name="parameters.drDataResourceId"/> </entity-one> <set field="textData" from-field="electronicText.textData"/> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sun Feb 1 10:27:43 2009 @@ -36,7 +36,7 @@ <set field="menuName" value="tree"/> <set field="currentMenuItemName" value="approval"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"/> + <entity-one entity-name="Content" value-field="content" use-cache="true"/> <set from-field="content.contentTypeId" field="contentTypeId"/> <service service-name="getApprovalsWithPermissions" result-map-name="result"> <field-map field-name="rootContentId" env-name="contentId"/> @@ -109,7 +109,7 @@ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId"/> <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="contentId"/> <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="contentRevisionSeqId"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"/> + <entity-one entity-name="Content" value-field="content" use-cache="true"/> <set from-field="content.contentTypeId" field="contentTypeId"/> <set field="menuName" value="empty"/> @@ -153,12 +153,12 @@ <set field="menuName" value="tree"/> <set field="currentMenuItemName" value="approval"/> - <entity-one entity-name="ContentApproval" value-name="contentApproval" use-cache="true"> + <entity-one entity-name="ContentApproval" value-field="contentApproval" use-cache="true"> <field-map env-name="parameters.contentApprovalId" field-name="contentApprovalId"/> </entity-one> <set from-field="contentApproval.contentId" field="rootContentId"/> <set from-field="contentApproval.contentRevisionSeqId" field="rootContentRevisionSeqId"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"> + <entity-one entity-name="Content" value-field="content" use-cache="true"> <field-map field-name="contentId" env-name="contentApproval.contentId"/> </entity-one> <set from-field="content.contentTypeId" field="contentTypeId"/> @@ -196,12 +196,12 @@ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/> <set from-field="rootContentId" field="contentId"/> <set from-field="rootContentRevisionSeqId" field="contentRevisionSeqId"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"/> + <entity-one entity-name="Content" value-field="content" use-cache="true"/> <set from-field="content.contentTypeId" field="contentTypeId"/> <set field="menuName" value="tree"/> <set field="currentMenuItemName" value="revision"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"> + <entity-one entity-name="Content" value-field="content" use-cache="true"> <field-map field-name="contentId" env-name="contentId"/> </entity-one> <set from-field="content.contentTypeId" field="contentTypeId"/> @@ -243,13 +243,13 @@ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId"/> <set from-field="parameters.contentId" field="contentId"/> <set from-field="parameters.contentRevisionSeqId" field="contentRevisionSeqId"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"/> + <entity-one entity-name="Content" value-field="content" use-cache="true"/> <set from-field="content.contentTypeId" field="contentTypeId"/> <set field="menuName" value="tree"/> <set field="currentMenuItemName" value="revision"/> <set field="title" value="${uiLabelMap.ContentCompDocRevisionListPageForContent} ${rootContentId} ${uiLabelMap.ContentCompDocRevisions} ${rootContentRevisionSeqId}"/> - <entity-one entity-name="ContentRevision" value-name="contentRevision" use-cache="true"/> + <entity-one entity-name="ContentRevision" value-field="contentRevision" use-cache="true"/> </actions> <widgets> <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml"> @@ -283,7 +283,7 @@ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/> <set from-field="rootContentId" field="contentId"/> <set from-field="rootContentRevisionSeqId" field="contentRevisionSeqId"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"/> + <entity-one entity-name="Content" value-field="content" use-cache="true"/> <set from-field="content.contentTypeId" field="contentTypeId"/> <set field="menuName" value="tree"/> <set field="currentMenuItemName" value="revision"/> @@ -326,13 +326,13 @@ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/> <set from-field="parameters.contentId" default-value="${rootContentId}" field="contentId"/> <set from-field="parameters.contentRevisionSeqId" default-value="${rootContentRevisionSeqId}" field="contentRevisionSeqId"/> - <entity-one entity-name="Content" value-name="content" use-cache="true"/> + <entity-one entity-name="Content" value-field="content" use-cache="true"/> <set from-field="content.contentTypeId" field="contentTypeId"/> <set field="menuName" value="tree"/> <set field="currentMenuItemName" value="revision"/> <set field="title" value="${uiLabelMap.ContentCompDocRevisionItemEditPage} ${contentId} ${uiLabelMap.ContentCompDocRevisions} ${contentRevisionSeqId}"/> - <entity-one entity-name="ContentRevisionItem" value-name="contentRevisionItem" use-cache="true"/> + <entity-one entity-name="ContentRevisionItem" value-field="contentRevisionItem" use-cache="true"/> </actions> <widgets> <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml"> @@ -477,8 +477,8 @@ <set field="currentMenuItemName" value="edit"/> <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="contentId"/> <set from-field="contentId" field="rootContentId"/> - <entity-one entity-name="Content" value-name="content" use-cache="false"/> - <entity-one entity-name="DataResource" value-name="dataResource" use-cache="false"> + <entity-one entity-name="Content" value-field="content" use-cache="false"/> + <entity-one entity-name="DataResource" value-field="dataResource" use-cache="false"> <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> </entity-one> <set from-field="dataResource.mimeTypeId" field="mimeTypeId"/> @@ -582,10 +582,10 @@ <set field="rootContentRevisionSeqId" from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}"/> <set field="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId" default-value="${mostRecentRevisionSeqId}"/> - <entity-one entity-name="Content" value-name="itemContent" use-cache="false"> + <entity-one entity-name="Content" value-field="itemContent" use-cache="false"> <field-map field-name="contentId" env-name="contentId"/> </entity-one> - <entity-one entity-name="ContentAssoc" value-name="contentAssoc"> + <entity-one entity-name="ContentAssoc" value-field="contentAssoc"> <field-map field-name="contentIdTo" env-name="rootContentId"/> <field-map field-name="contentId" env-name="contentId"/> <field-map field-name="fromDate" env-name="parameters.caFromDate"/> @@ -607,7 +607,7 @@ </entity-condition> <set field="itemContentRevisionSeqId" from-field="parameters.itemContentRevisionSeqId" default-value="${contentRevisionItems[0].contentRevisionSeqId}"/> <set field="dataResourceId" from-field="contentRevisionItems[0].newDataResourceId" default-value="${itemContent.dataResourceId}"/> - <entity-one entity-name="DataResource" value-name="dataResource" use-cache="false"> + <entity-one entity-name="DataResource" value-field="dataResource" use-cache="false"> <field-map field-name="dataResourceId" env-name="dataResourceId"/> </entity-one> <set field="mimeTypeId" from-field="dataResource.mimeTypeId"/> @@ -680,10 +680,10 @@ </entity-condition> <set from-field="rootRevList[0].maxRevisionSeqId" field="rootInstanceRevSeqId"/> --> - <entity-one entity-name="Content" value-name="templateContent" use-cache="false"> + <entity-one entity-name="Content" value-field="templateContent" use-cache="false"> <field-map field-name="contentId" env-name="itemContent.instanceOfContentId"/> </entity-one> - <entity-one entity-name="DataResource" value-name="templateDataResource" use-cache="false"> + <entity-one entity-name="DataResource" value-field="templateDataResource" use-cache="false"> <field-map field-name="dataResourceId" env-name="templateContent.dataResourceId"/> </entity-one> </actions> @@ -822,7 +822,7 @@ </or> </condition> <actions> - <entity-one entity-name="ElectronicText" value-name="electronicText"> + <entity-one entity-name="ElectronicText" value-field="electronicText"> <field-map field-name="dataResourceId" env-name="dataResource.dataResourceId"/> </entity-one> <set from-field="electronicText.textData" field="textData"/> @@ -926,7 +926,7 @@ <order-by field-name="-contentRevisionSeqId"/> </entity-condition> <set from-field="parameters.rootContentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}" field="rootContentRevisionSeqId"/> - <entity-one entity-name="Content" value-name="templateContent"> + <entity-one entity-name="Content" value-field="templateContent"> <field-map field-name="contentId" env-name="rootContentId"/> </entity-one> <set from-field="templateContent.contentName" field="contentName"/> @@ -973,7 +973,7 @@ <set field="title" value="Add Composite Document Instance Part Page"/> <set field="contentIdTo" from-field="parameters.rootContentId"/> <set field="templateContentId" from-field="parameters.instanceOfContentId"/> - <entity-one entity-name="Content" value-name="templateContent"> + <entity-one entity-name="Content" value-field="templateContent"> <field-map field-name="contentId" env-name="templateContentId"/> </entity-one> <set from-field="templateContent.contentName" field="contentName"/> @@ -1077,7 +1077,7 @@ <set from-field="revisionResult.mostRecentRevisionSeqId" field="mostRecentRevisionSeqId"/> <set from-field="parameters.rootContentRevisionSeqId" default-value="${mostRecentRevisionSeqId}" field="rootContentRevisionSeqId"/> - <entity-one entity-name="Content" value-name="instanceContent"> + <entity-one entity-name="Content" value-field="instanceContent"> <field-map field-name="contentId" env-name="rootContentId"/> </entity-one> <set from-field="instanceContent.instanceOfContentId" field="templateContentId"/> @@ -1122,7 +1122,7 @@ <field-map field-name="contentId" env-name="rootContentId"/> <field-map field-name="contentRevisionSeqId" env-name="rootContentRevisionSeqId"/> </service> - <entity-one entity-name="StatusItem" value-name="statusItem"> + <entity-one entity-name="StatusItem" value-field="statusItem"> <field-map field-name="statusId" env-name="approvalStatusResult.approvalStatusId"/> </entity-one> </actions> @@ -1216,10 +1216,10 @@ <iterate-section entry-name="assocRevisionItemView" list-name="assocRevisionItemViewList"> <section> <actions> - <entity-one entity-name="Content" value-name="instanceContent" auto-field-map="false"> + <entity-one entity-name="Content" value-field="instanceContent" auto-field-map="false"> <field-map field-name="contentId" env-name="assocRevisionItemView.itemContentId"/> </entity-one> - <entity-one entity-name="DataResource" value-name="instanceDataResource" auto-field-map="false"> + <entity-one entity-name="DataResource" value-field="instanceDataResource" auto-field-map="false"> <field-map field-name="dataResourceId" env-name="instanceContent.dataResourceId"/> </entity-one> </actions> @@ -1311,8 +1311,8 @@ <screen name="ViewCompDocContent"> <section> <actions> - <entity-one entity-name="Content" value-name="content" use-cache="true"/> - <entity-one entity-name="DataResource" value-name="dataResource" use-cache="true"> + <entity-one entity-name="Content" value-field="content" use-cache="true"/> + <entity-one entity-name="DataResource" value-field="dataResource" use-cache="true"> <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> </entity-one> </actions> Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sun Feb 1 10:27:43 2009 @@ -77,7 +77,7 @@ <set field="titleProperty" value="PageTitleEditContent"/> <set field="tabButtonItem" value="content"/> <set field="contentId" from-field="parameters.contentId"/> - <entity-one entity-name="Content" value-name="currentValue"/> + <entity-one entity-name="Content" value-field="currentValue"/> </actions> <widgets> <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -113,7 +113,7 @@ <set field="contentAssocTypeId" from-field="parameters.contentAssocTypeId" default-value="${defaultContentAssocTypeId}"/> <set field="contentAssocTypeId" from-field="contentAssocTypeId" to-scope="user"/> <set field="fromDate" from-field="parameters.fromDate" /> - <entity-one entity-name="Content" value-name="currentValue"/> + <entity-one entity-name="Content" value-field="currentValue"/> </actions> <widgets> <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -213,7 +213,7 @@ <set field="contentId" from-field="parameters.contentId" /> <set field="contentRoleTarget" value=""/> - <entity-one entity-name="Content" value-name="currentValue"> + <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" env-name="parameters.contentId"/> </entity-one> </actions> @@ -237,7 +237,7 @@ <set field="titleProperty" value="PageTitleEditContentPurpose"/> <set field="tabButtonItem" value="purpose"/> <set field="contentId" from-field="parameters.contentId" /> - <entity-one entity-name="Content" value-name="currentValue"> + <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" env-name="parameters.contentId"/> </entity-one> </actions> @@ -261,7 +261,7 @@ <set field="titleProperty" value="PageTitleEditContentAttribute"/> <set field="tabButtonItem" value="attribute"/> <set field="contentId" from-field="parameters.contentId" /> - <entity-one entity-name="Content" value-name="currentValue"> + <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" env-name="parameters.contentId"/> </entity-one> </actions> @@ -288,7 +288,7 @@ <condition-expr field-name="contentId" env-name="parameters.contentId"/> <order-by field-name="webSiteId"/> </entity-condition> - <entity-one entity-name="Content" value-name="currentValue"> + <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" env-name="parameters.contentId"/> </entity-one> </actions> @@ -321,7 +321,7 @@ <set field="titleProperty" value="PageTitleEditContentMetadata"/> <set field="tabButtonItem" value="metaData"/> <set field="contentId" from-field="parameters.contentId" /> - <entity-one entity-name="Content" value-name="currentValue"> + <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" env-name="parameters.contentId"/> </entity-one> </actions> @@ -345,7 +345,7 @@ <set field="titleProperty" value="PageTitleEditContentWorkEffort"/> <set field="tabButtonItem" value="workEffort"/> <set field="contentId" from-field="parameters.contentId" /> - <entity-one entity-name="Content" value-name="currentValue"> + <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" env-name="parameters.contentId"/> </entity-one> </actions> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Sun Feb 1 10:27:43 2009 @@ -138,7 +138,7 @@ <form name="EditDataResource" target="updateDataResource" title="" type="single" default-map-name="currentValue" header-row-style="header-row" default-table-style="basic-table"> <actions> - <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false"> + <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false"> <field-map field-name="statusId" env-name="currentValue.statusId"/> </entity-one> </actions> @@ -435,7 +435,7 @@ header-row-style="header-row" default-table-style="basic-table"> <!--auto-fields-service service-name="updateElectronicText"/--> <actions> - <entity-one entity-name="ElectronicText" value-name="electronicText"/> + <entity-one entity-name="ElectronicText" value-field="electronicText"/> </actions> <alt-target use-when="electronicText==null" target="addElectronicText"/> <field name="dataResourceId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><display also-hidden="true"/></field> @@ -455,7 +455,7 @@ <form name="EditHtmlText" target="updateHtmlText" title="" type="single" default-map-name="electronicText" header-row-style="header-row" default-table-style="basic-table"> <actions> - <entity-one entity-name="ElectronicText" value-name="electronicText"/> + <entity-one entity-name="ElectronicText" value-field="electronicText"/> </actions> <alt-target use-when="electronicText==null" target="addHtmlText"/> <auto-fields-entity entity-name="ElectronicText"/> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sun Feb 1 10:27:43 2009 @@ -174,7 +174,7 @@ <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResource"/> <set field="dataResourceId" from-field="parameters.dataResourceId"/> - <entity-one entity-name="DataResource" value-name="currentValue"/> + <entity-one entity-name="DataResource" value-field="currentValue"/> <entity-condition entity-name="DataCategory" list-name="dataCategoryList"/> </actions> <widgets> @@ -230,7 +230,7 @@ <set field="titleProperty" value="PageTitleUploadImageDataResource"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="uploadImage"/> - <entity-one entity-name="DataResource" value-name="currentValue"> + <entity-one entity-name="DataResource" value-field="currentValue"> <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> </entity-one> </actions> @@ -362,7 +362,7 @@ <set field="titleProperty" value="PageTitleEditElectronicText"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editElectronicText"/> - <entity-one entity-name="DataResource" value-name="currentValue"/> + <entity-one entity-name="DataResource" value-field="currentValue"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> @@ -392,7 +392,7 @@ <set field="titleProperty" value="PageTitleEditDataResourceAttribute"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResourceAttribute"/> - <entity-one entity-name="DataResource" value-name="currentValue"> + <entity-one entity-name="DataResource" value-field="currentValue"> <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> </entity-one> <get-related value-name="currentValue" relation-name="DataResourceAttribute" list-name="dataResourceAttribute"/> @@ -415,7 +415,7 @@ <set field="titleProperty" value="PageTitleEditDataResourceRole"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResourceRole"/> - <entity-one entity-name="DataResource" value-name="currentValue"> + <entity-one entity-name="DataResource" value-field="currentValue"> <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> </entity-one> <get-related value-name="currentValue" relation-name="DataResourceRole" list-name="dataResourceRole"/> @@ -438,7 +438,7 @@ <set field="titleProperty" value="PageTitleEditDataResourceProductFeatures"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editDataResourceProductFeatures"/> - <entity-one entity-name="DataResource" value-name="currentValue"> + <entity-one entity-name="DataResource" value-field="currentValue"> <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/> </entity-one> <get-related value-name="currentValue" relation-name="ProductFeatureDataResource" list-name="productFeatureDataResource"/> @@ -461,7 +461,7 @@ <set field="titleProperty" value="PageTitleEditHtmlText"/> <set field="headerItem" value="DataResource"/> <set field="tabButtonItem" value="editHtmlText"/> - <entity-one entity-name="DataResource" value-name="currentValue"/> + <entity-one entity-name="DataResource" value-field="currentValue"/> </actions> <widgets> <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Sun Feb 1 10:27:43 2009 @@ -88,7 +88,7 @@ <set field="titleProperty" value="PageTitleFindForums"/> <set field="tabBar" value="ForumGroupTabBar"/> <set field="forumGroupId" from-field="parameters.forumGroupId" default-value="parameters.contentId"/> - <entity-one entity-name="Content" value-name="forumGroup"> + <entity-one entity-name="Content" value-field="forumGroup"> <field-map field-name="contentId" env-name="forumGroupId"/> </entity-one> <set field="objectName" from-field="forumGroup.contentName"/> @@ -116,7 +116,7 @@ <set field="titleProperty" value="PageTitleForumGroupRoles"/> <set field="tabButtonItem" value="roles"/> <set field="tabBar" value="ForumGroupTabBar"/> - <entity-one entity-name="Content" value-name="forumGroup"> + <entity-one entity-name="Content" value-field="forumGroup"> <field-map field-name="contentId" env-name="parameters.forumGroupId"/> </entity-one> <set field="objectName" from-field="forumGroup.contentName"/> @@ -145,7 +145,7 @@ <set field="titleProperty" value="PageTitleForumGroupPurposes"/> <set field="tabButtonItem" value="purposes"/> <set field="tabBar" value="ForumGroupTabBar"/> - <entity-one entity-name="Content" value-name="forumGroup"> + <entity-one entity-name="Content" value-field="forumGroup"> <field-map field-name="contentId" env-name="parameters.forumGroupId"/> </entity-one> <set field="objectName" from-field="forumGroup.contentName"/> @@ -176,7 +176,7 @@ <set field="tabBar" value="ForumMessagesTabBar"/> <set field="tabButtonItem" value="messageList"/> <set field="labelTitleProperty" value="PageTitleFindForumMessages"/> - <entity-one entity-name="Content" value-name="forum"> + <entity-one entity-name="Content" value-field="forum"> <field-map field-name="contentId" env-name="parameters.forumId"/> </entity-one> <set field="objectName" from-field="forum.contentName"/> @@ -215,7 +215,7 @@ <set field="responseContentId" from-field="parameters.forumId" /> <set field="threadContentId" from-field="parameters.threadContentId" default-value="${contentId}" /> <set field="forumId" from-field="parameters.forumId" /> - <entity-one entity-name="Content" value-name="content" use-cache="true"> + <entity-one entity-name="Content" value-field="content" use-cache="true"> <field-map field-name="contentId" env-name="contentId"/> </entity-one> <set field="ownerContentId" from-field="content.ownerContentId" default-value="${forumId}" /> @@ -228,19 +228,19 @@ <set field="tabBar" value="ForumMessagesTabBar"/> <set field="tabButtonItem" value="messageThread"/> <set field="labelTitleProperty" value="PageTitleFindForumMessages"/> - <entity-one entity-name="Content" value-name="forum"> + <entity-one entity-name="Content" value-field="forum"> <field-map field-name="contentId" env-name="parameters.forumId"/> </entity-one> <set field="objectName" from-field="forum.contentName"/> <set field="objectId" from-field="forum.contentId"/> <set field="forumNbrMessages" from-field="forum.childBranchCount" default-value="0"/> - <entity-one entity-name="Content" value-name="forumThread"> + <entity-one entity-name="Content" value-field="forumThread"> <field-map field-name="contentId" env-name="parameters.forumThreadId"/> </entity-one> - <entity-one entity-name="Content" value-name="forumMessage"> + <entity-one entity-name="Content" value-field="forumMessage"> <field-map field-name="contentId" env-name="parameters.forumMessageId"/> </entity-one> - <entity-one entity-name="ElectronicText" value-name="electronicText"> + <entity-one entity-name="ElectronicText" value-field="electronicText"> <field-map field-name="dataResourceId" env-name="forumMessage.dataResourceId"/> </entity-one> <set field="contentId" from-field="parameters.forumId"/> @@ -340,7 +340,7 @@ <set field="tabBar" value="ForumMessagesTabBar"/> <set field="tabButtonItem" value=""/> <set field="labelTitleProperty" value="PageTitleFindForumMessages"/> - <entity-one entity-name="Content" value-name="forumMessage"> + <entity-one entity-name="Content" value-field="forumMessage"> <field-map field-name="contentId" env-name="parameters.forumMessageIdTo"/> </entity-one> </actions> @@ -376,7 +376,7 @@ <set field="tabBar" value="ForumMessagesTabBar"/> <set field="tabButtonItem" value=""/> <set field="labelTitleProperty" value="PageTitleFindForumMessages"/> - <entity-one entity-name="Content" value-name="forumMessage"> + <entity-one entity-name="Content" value-field="forumMessage"> <field-map field-name="contentId" env-name="parameters.forumMessageIdTo"/> </entity-one> </actions> Modified: ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml Sun Feb 1 10:27:43 2009 @@ -25,7 +25,7 @@ default-render-style="expand-collapse" expand-collapse-request="findForumThreads?forumId=${parameters.forumId}"> --> <tree name="MessageTree" root-node-name="node-root" default-render-style="simple"> <node name="node-root"> - <entity-one entity-name="Content" use-cache="false" value-name="rsp"> + <entity-one entity-name="Content" use-cache="false" value-field="rsp"> <field-map field-name="contentId" env-name="parameters.forumId"/> </entity-one> <!--include-screen name="responseTreeLine" location="component://content/widget/forum/ForumScreens.xml" /--> Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Sun Feb 1 10:27:43 2009 @@ -97,7 +97,7 @@ <set field="tabButtonItem" to-scope="user" value="EditLayout"/> <set field="wrapTemplateId" value="STDWRAP001"/> - <entity-one entity-name="ContentDataResourceView" value-name="currentValue"/> + <entity-one entity-name="ContentDataResourceView" value-field="currentValue"/> </actions> <widgets> <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> @@ -133,7 +133,7 @@ <set field="headerItem" value="Layout"/> <set field="tabButtonItem" to-scope="user" value="EditLayoutSubContent"/> - <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/> + <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/> <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/> </actions> <widgets> @@ -165,7 +165,7 @@ <set field="headerItem" value="Layout"/> <set field="tabButtonItem" to-scope="user" value="EditLayoutText"/> - <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/> + <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/> <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/> </actions> <widgets> @@ -186,7 +186,7 @@ <set field="headerItem" value="Layout"/> <set field="tabButtonItem" to-scope="user" value="EditLayoutHtml"/> - <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/> + <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/> <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/> </actions> <widgets> @@ -207,7 +207,7 @@ <set field="headerItem" value="Layout"/> <set field="tabButtonItem" to-scope="user" value="EditLayoutUrl"/> - <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/> + <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/> <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/> </actions> <widgets> @@ -228,7 +228,7 @@ <set field="headerItem" value="Layout"/> <set field="tabButtonItem" to-scope="user" value="EditLayoutImage"/> - <entity-one entity-name="SubContentDataResourceView" value-name="currentValue"/> + <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/> <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/> </actions> <widgets> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml Sun Feb 1 10:27:43 2009 @@ -81,12 +81,12 @@ </call-service> <!-- call the service with the system account to get around security constraints for this special create --> - <entity-one entity-name="UserLogin" value-name="createUlInMap.userLogin" auto-field-map="false"> + <entity-one entity-name="UserLogin" value-field="createUlInMap.userLogin" auto-field-map="false"> <field-map field-name="userLoginId" value="system"/> </entity-one> <call-service service-name="createUserLogin" in-map-name="createUlInMap"/> - <entity-one entity-name="UserLogin" value-name="newUserLogin"/> + <entity-one entity-name="UserLogin" value-field="newUserLogin"/> <field-to-result field-name="newUserLogin"/> <field-to-result field-name="createUlInMap.partyId" result-name="partyId"/> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sun Feb 1 10:27:43 2009 @@ -633,10 +633,10 @@ <form name="ToFacilityTransfers" type="list" target="" title="" list-name="toTransfers" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> - <entity-one entity-name="InventoryItem" value-name="inventoryItem"> + <entity-one entity-name="InventoryItem" value-field="inventoryItem"> <field-map field-name="inventoryItemId"/> </entity-one> - <entity-one entity-name="Product" value-name="product"> + <entity-one entity-name="Product" value-field="product"> <field-map field-name="productId" env-name="inventoryItem.productId"/> </entity-one> </row-actions> @@ -670,10 +670,10 @@ <form name="FromFacilityTransfers" type="list" target="" title="" list-name="fromTransfers" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> - <entity-one entity-name="InventoryItem" value-name="inventoryItem"> + <entity-one entity-name="InventoryItem" value-field="inventoryItem"> <field-map field-name="inventoryItemId"/> </entity-one> - <entity-one entity-name="Product" value-name="product"> + <entity-one entity-name="Product" value-field="product"> <field-map field-name="productId" env-name="inventoryItem.productId"/> </entity-one> </row-actions> @@ -707,10 +707,10 @@ <form name="FromFacilityTransfersComplete" type="multi" target="CompleteRequestedTransfers?completeRequested=true&facilityId=${facilityId}" title="" list-name="fromTransfers" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> - <entity-one entity-name="InventoryItem" value-name="inventoryItem"> + <entity-one entity-name="InventoryItem" value-field="inventoryItem"> <field-map field-name="inventoryItemId"/> </entity-one> - <entity-one entity-name="Product" value-name="product"> + <entity-one entity-name="Product" value-field="product"> <field-map field-name="productId" env-name="inventoryItem.productId"/> </entity-one> </row-actions> Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Sun Feb 1 10:27:43 2009 @@ -28,7 +28,7 @@ <set field="facilityId" from-field="inventoryItem.facilityId"/> <set field="locationSeqId" from-field="inventoryItem.locationSeqId"/> <set field="statusId" from-field="inventoryItem.statusId"/> - <entity-one entity-name="FacilityLocation" value-name="facilityLocation"> + <entity-one entity-name="FacilityLocation" value-field="facilityLocation"> <field-map field-name="locationSeqId" env-name="locationSeqId"/> <field-map field-name="facilityId" env-name="facilityId"/> </entity-one> Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Sun Feb 1 10:27:43 2009 @@ -31,7 +31,7 @@ <set field="tabButtonItem" value="ProductCatalog"/> <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> - <entity-one entity-name="ProdCatalog" value-name="prodCatalog"/> + <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> </actions> <widgets> <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> @@ -69,7 +69,7 @@ <set field="tabButtonItem" value="ProductCategories"/> <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> - <entity-one entity-name="ProdCatalog" value-name="prodCatalog"/> + <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> <entity-and entity-name="ProdCatalogCategory" list-name="prodCatalogCategories"> <field-map field-name="prodCatalogId"/> @@ -131,7 +131,7 @@ <set field="tabButtonItem" value="PartyParties"/> <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> - <entity-one entity-name="ProdCatalog" value-name="prodCatalog"/> + <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> <entity-and entity-name="ProdCatalogRole" list-name="prodCatalogRoleList"> <field-map field-name="prodCatalogId"/> @@ -189,7 +189,7 @@ <set field="tabButtonItem" value="ProductStores"/> <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> - <entity-one entity-name="ProdCatalog" value-name="prodCatalog"/> + <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> <entity-and entity-name="ProductStoreCatalog" list-name="productStoreCatalogList"> <field-map field-name="prodCatalogId"/> Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Sun Feb 1 10:27:43 2009 @@ -72,7 +72,7 @@ <set field="labelTitleProperty" value="ProductCategory"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <entity-one entity-name="ProductCategory" value-name="productCategory"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> <entity-condition entity-name="ProductCategoryType" list-name="productCategoryTypes"> <order-by field-name="description"/> @@ -100,7 +100,7 @@ <set field="labelTitleProperty" value="ProductCategoryContent"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <entity-one entity-name="ProductCategory" value-name="productCategory"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> <get-related-one value-name="productCategory" relation-name="ProductCategoryType" to-value-name="productCategoryType"/> <set field="categoryContentOrderList[]" value="prodCatContentTypeId"/> <get-related value-name="productCategory" relation-name="ProductCategoryContent" list-name="productCategoryContentList" order-by-list-name="categoryContentOrderList"/> @@ -172,10 +172,10 @@ <set field="labelTitleProperty" value="ProductCategoryContent"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <entity-one entity-name="ProductCategory" value-name="productCategory"/> - <entity-one entity-name="ProductCategoryContent" value-name="categoryContent"/> - <entity-one entity-name="Content" value-name="content"/> - <entity-one entity-name="ElectronicText" value-name="electronicText" auto-field-map="false"> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> + <entity-one entity-name="ProductCategoryContent" value-field="categoryContent"/> + <entity-one entity-name="Content" value-field="content"/> + <entity-one entity-name="ElectronicText" value-field="electronicText" auto-field-map="false"> <field-map field-name="dataResourceId" env-name="content.dataResourceId"/> </entity-one> <set field="textDataMap.text" from-field="electronicText.textData"/> @@ -301,7 +301,7 @@ <set field="labelTitleProperty" value="ProductCatalogs"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <entity-one entity-name="ProductCategory" value-name="productCategory"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> <entity-condition entity-name="ProdCatalogCategory" list-name="prodCatalogCategories"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> @@ -337,7 +337,7 @@ <set field="labelTitleProperty" value="ProductFeatureCategoriesGroups"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <entity-one entity-name="ProductCategory" value-name="productCategory"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> <entity-condition entity-name="ProductFeatureCategoryAppl" list-name="productFeatureCategoryAppls"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> @@ -375,7 +375,7 @@ <set field="labelTitleProperty" value="PartyParties"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <entity-one entity-name="ProductCategory" value-name="productCategory"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> <entity-condition entity-name="ProductCategoryRole" list-name="productCategoryRoles"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> @@ -406,7 +406,7 @@ <set field="tabButtonItem" value="EditCategoryAttributes"/> <set field="labelTitleProperty" value="ProductCategoryAttributes"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <entity-one entity-name="ProductCategory" value-name="productCategory"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> <entity-condition entity-name="ProductCategoryAttribute" list-name="categoryAttributes"> <condition-expr field-name="productCategoryId" env-name="productCategoryId"/> </entity-condition> @@ -456,7 +456,7 @@ <set field="labelTitleProperty" value="ProductCreateProductInCategory"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <entity-one entity-name="ProductCategory" value-name="productCategory"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> </actions> <widgets> <decorator-screen name="CommonCategoryDecorator"> @@ -477,7 +477,7 @@ <set field="labelTitleProperty" value="ProductCreateProductInCategory"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> - <entity-one entity-name="ProductCategory" value-name="productCategory"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> <script location="component://product/webapp/catalog/WEB-INF/actions/category/CreateProductInCategoryCheckExisting.groovy"/> </actions> @@ -505,7 +505,7 @@ <set field="productCategoryId" from-field="parameters.productCategoryId"/> <set field="linkSeqId" from-field="parameters.linkSeqId"/> <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> - <entity-one entity-name="ProductCategoryLink" value-name="productCategoryLink"/> + <entity-one entity-name="ProductCategoryLink" value-field="productCategoryLink"/> </actions> <widgets> <decorator-screen name="CommonCategoryDecorator"> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sun Feb 1 10:27:43 2009 @@ -58,7 +58,7 @@ <set field="MainColumnStyle" value="leftonly"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <set field="productName" from-field="product.productName"/> </actions> <widgets> @@ -329,7 +329,7 @@ <set field="headerItem" value="main"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sun Feb 1 10:27:43 2009 @@ -102,7 +102,7 @@ <set field="labelTitleProperty" value="ProductConfigItem"/> <set field="configItemId" from-field="parameters.configItemId"/> - <entity-one entity-name="ProductConfigItem" value-name="configItem" auto-field-map="true"/> + <entity-one entity-name="ProductConfigItem" value-field="configItem" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="CommonConfigDecorator"> @@ -135,13 +135,13 @@ <set field="labelTitleProperty" value="ProductConfigOptions"/> <set field="configItemId" from-field="parameters.configItemId"/> - <entity-one entity-name="ProductConfigItem" value-name="configItem" auto-field-map="true"/> + <entity-one entity-name="ProductConfigItem" value-field="configItem" auto-field-map="true"/> <set field="configOptionId" from-field="parameters.configOptionId"/> - <entity-one entity-name="ProductConfigOption" value-name="configOption" auto-field-map="true"/> + <entity-one entity-name="ProductConfigOption" value-field="configOption" auto-field-map="true"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="ProductConfigProduct" value-name="productConfigProduct" auto-field-map="true"/> + <entity-one entity-name="ProductConfigProduct" value-field="productConfigProduct" auto-field-map="true"/> <entity-condition entity-name="ProductConfigOption" list-name="configOptionList"> <condition-expr field-name="configItemId" env-name="configItemId"/> @@ -197,7 +197,7 @@ <set field="labelTitleProperty" value="ProductContent"/> <set field="configItemId" from-field="parameters.configItemId"/> - <entity-one entity-name="ProductConfigItem" value-name="configItem" auto-field-map="true"/> + <entity-one entity-name="ProductConfigItem" value-field="configItem" auto-field-map="true"/> <script location="component://product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy"/> </actions> @@ -221,7 +221,7 @@ <set field="labelTitleProperty" value=""/> <set field="configItemId" from-field="parameters.configItemId"/> - <entity-one entity-name="ProductConfigItem" value-name="configItem" auto-field-map="true"/> + <entity-one entity-name="ProductConfigItem" value-field="configItem" auto-field-map="true"/> <set field="fromDate" from-field="requetParameters.fromDate" type="Timestamp"/> Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sun Feb 1 10:27:43 2009 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -28,7 +28,7 @@ <set field="MainColumnStyle" value="leftonly"/> <!--<set field="productId" from-field="parameters.productId"/>--> - <!--<entity-one entity-name="Product" value-name="product"/>--> + <!--<entity-one entity-name="Product" value-field="product"/>--> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -60,7 +60,7 @@ <actions> <set field="titleProperty" value="PageTitleEditFeature"/> <set field="headerItem" value="featurecats"/> - <entity-one entity-name="ProductFeature" value-name="productFeature" auto-field-map="true"/> + <entity-one entity-name="ProductFeature" value-field="productFeature" auto-field-map="true"/> <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures"> <field-map field-name="productFeatureId" env-name="parameters.productFeatureId"/> </entity-and> @@ -180,7 +180,7 @@ <set field="headerItem" value="featurecats"/> <set field="tabButtonItem" value="FeatureType"/> <set field="productFeatureTypeId" from-field="parameters.productFeatureTypeId"/> - <entity-one entity-name="ProductFeatureType" value-name="productFeatureType"/> + <entity-one entity-name="ProductFeatureType" value-field="productFeatureType"/> </actions> <widgets> <decorator-screen name="CommonFeatureDecorator"> @@ -243,7 +243,7 @@ <set field="productFeatureId" from-field="parameters.productFeatureId"/> <set field="productFeatureIdTo" from-field="parameters.productFeatureIdTo"/> - <entity-one entity-name="ProductFeatureIactn" value-name="productFeatureIactn"/> + <entity-one entity-name="ProductFeatureIactn" value-field="productFeatureIactn"/> </actions> <widgets> @@ -534,7 +534,7 @@ <actions> <set field="titleProperty" value="PageTitleEditFeature"/> <set field="headerItem" value="featurecats"/> - <entity-one entity-name="ProductFeature" value-name="productFeature" auto-field-map="true"/> + <entity-one entity-name="ProductFeature" value-field="productFeature" auto-field-map="true"/> <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures"> <field-map field-name="productFeatureId" env-name="parameters.productFeatureId"/> </entity-and> Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Sun Feb 1 10:27:43 2009 @@ -117,7 +117,7 @@ <set field="title" value="Find Product By ID"/> <set field="idValue" from-field="parameters.idValue"/> - <entity-one entity-name="Product" value-name="idProduct" auto-field-map="false"> + <entity-one entity-name="Product" value-field="idProduct" auto-field-map="false"> <field-map field-name="productId" env-name="idValue"/> </entity-one> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |