svn commit: r739779 - in /ofbiz/trunk/specialpurpose: assetmaint/widget/ assetmaint/widget/forms/ assetmaint/widget/ismgr/ googlebase/widget/ mypage/widget/ myportal/widget/ oagis/widget/forms/ projectmgr/widget/
Locked
 
|
Author: mrisaliti
Date: Sun Feb 1 15:21:46 2009 New Revision: 739779 URL: http://svn.apache.org/viewvc?rev=739779&view=rev Log: Artifact cleaning on various specialpurpose components after recent changes on xsd files (OFBIZ-2137) Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.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/WorkEffortTrees.xml Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sun Feb 1 15:21:46 2009 @@ -99,11 +99,11 @@ <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/> <set field="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/> <entity-one entity-name="WorkEffort" value-field="workEffort"/> - <get-related-one value-name="workEffort" relation-name="WorkEffortType" to-value-name="workEffortType"/> - <get-related-one value-name="workEffort" relation-name="CurrentStatusItem" to-value-name="currentStatusItem"/> - <get-related-one value-name="workEffort" relation-name="WorkEffortPurposeType" to-value-name="workEffortPurposeType"/> - <get-related-one value-name="fixedAsset" relation-name="LocatedAtFacility" to-value-name="facility"/> - <entity-and entity-name="WorkEffortPartyAssignView" list-name="relatedPartyAssigns"> + <get-related-one value-field="workEffort" relation-name="WorkEffortType" to-value-field="workEffortType"/> + <get-related-one value-field="workEffort" relation-name="CurrentStatusItem" to-value-field="currentStatusItem"/> + <get-related-one value-field="workEffort" relation-name="WorkEffortPurposeType" to-value-field="workEffortPurposeType"/> + <get-related-one value-field="fixedAsset" relation-name="LocatedAtFacility" to-value-field="facility"/> + <entity-and entity-name="WorkEffortPartyAssignView" list="relatedPartyAssigns"> <field-map field-name="workEffortId"/> </entity-and> <property-map resource="AccountingUiLabels" map-name="uiLabelMap"/> @@ -305,7 +305,7 @@ </entity-condition> <set field="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/> <entity-condition list="notes" entity-name="WorkEffortNoteAndData"> - <condition-expr field-name="workEffortId" env-name="workEffortId"/> + <condition-expr field-name="workEffortId" from-field="workEffortId"/> <order-by field-name="noteId"/> </entity-condition> <script location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Sun Feb 1 15:21:46 2009 @@ -67,7 +67,7 @@ <form name="ListFixedAssetMaints" target="" title="" type="list" list-name="listIt" paginate-target="findFixedAssetMaints" paginate="true" header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map="result" result-map-list-name="listIt"> + <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="FixedAssetMaintWorkEffort"/> <field-map field-name="orderBy" value="-actualStartDate"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Sun Feb 1 15:21:46 2009 @@ -60,7 +60,7 @@ <form name="ListProducts" type="list" list-name="listIt" paginate-target="${submitTarget}" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map="result" result-map-list-name="listIt"> + <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Product"/> </service> @@ -88,7 +88,7 @@ <form name="listLookupProduct" list-name="listIt" paginate-target="${submitTarget}" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map="result" result-map-list-name="listIt"> + <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Product"/> </service> @@ -112,7 +112,7 @@ header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table"> <actions> <entity-condition entity-name="ProductMaint" list="listIt"> - <condition-expr field-name="productId" env-name="productId"/> + <condition-expr field-name="productId" from-field="productId"/> </entity-condition> </actions> <field name="fixedAssetId"><hidden value="${parameters.fixedAssetId}"></hidden></field> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Sun Feb 1 15:21:46 2009 @@ -159,7 +159,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table"> <actions> <entity-condition entity-name="WorkEffortAssocView"> - <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortId"/> + <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/> </entity-condition> </actions> <field name="workEffortName" entry-name="workEffortToName" title="${uiLabelMap.CommonName}"> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml Sun Feb 1 15:21:46 2009 @@ -42,7 +42,7 @@ <form name="ListLookupComputerHardware" list-name="listIt" title="" type="list" paginate-target="LookupComputerHardware" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map="result" result-map-list-name="listIt"> + <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="FixedAsset"/> </service> @@ -75,7 +75,7 @@ <form name="ListLookupComputerSoftware" list-name="listIt" title="" type="list" paginate-target="LookupComputerSoftware" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map="result" result-map-list-name="listIt"> + <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="FixedAsset"/> </service> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml Sun Feb 1 15:21:46 2009 @@ -111,7 +111,7 @@ <form name="ListComputerHardware" type="list" list-name="listIt" paginate-target="ListFixedAssets" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map="result" result-map-list-name="listIt"> + <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="FixedAsset"/> </service> @@ -137,7 +137,7 @@ <form name="ListComputerSoftware" type="list" list-name="listIt" paginate-target="ListFixedAssets" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map="result" result-map-list-name="listIt"> + <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="FixedAsset"/> </service> @@ -162,8 +162,8 @@ <actions> <entity-condition entity-name="FixedAsset" list="listIt"> <condition-list combine="and"> - <condition-expr field-name="parentFixedAssetId" operator="equals" env-name="parameters.fixedAssetId"/> - <condition-expr field-name="fixedAssetTypeId" operator="equals" env-name="fixedAssetTypeId"/> + <condition-expr field-name="parentFixedAssetId" operator="equals" from-field="parameters.fixedAssetId"/> + <condition-expr field-name="fixedAssetTypeId" operator="equals" from-field="fixedAssetTypeId"/> </condition-list> </entity-condition> </actions> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Sun Feb 1 15:21:46 2009 @@ -123,11 +123,11 @@ <section> <actions> <set field="titleProperty" value="PageTitleAdvancedSearch"/> - <entity-condition entity-name="ProductCategory" list-name="productCategories"> + <entity-condition entity-name="ProductCategory" list="productCategories"> <condition-expr field-name="showInSelect" operator="not-equals" value="N"/> <order-by field-name="description"/> </entity-condition> - <entity-condition entity-name="ProdCatalog" list-name="prodCatalogs"> + <entity-condition entity-name="ProdCatalog" list="prodCatalogs"> <order-by field-name="catalogName"/> </entity-condition> <script location="component://product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy"/> Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sun Feb 1 15:21:46 2009 @@ -198,7 +198,7 @@ <section> <actions> <service service-name="getUserPreferenceGroup" - result-map-name="preferences"> + result-map="preferences"> <field-map field-name="userPrefGroupTypeId" value="MyPage" /> </service> <!-- check if there are any customer requests for this user --> @@ -207,7 +207,7 @@ <condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/> <condition-list combine="and"> <condition-expr field-name="roleTypeIdTo" operator="equals" value="REQ_TAKER"/> - <condition-expr field-name="partyIdTo" operator="equals" env-name="userLogin.partyId"/> + <condition-expr field-name="partyIdTo" operator="equals" from-field="userLogin.partyId"/> </condition-list> </condition-list> <order-by field-name="-custRequestDate"/> @@ -383,7 +383,7 @@ <actions> <set field="headerItem" value="preferences"/> <service service-name="getUserPreferenceGroup" - result-map-name="preferences"> + result-map="preferences"> <field-map field-name="userPrefGroupTypeId" value="MyPage" /> </service> </actions> @@ -510,7 +510,7 @@ <actions> <set field="headerItem" value="custPreferences"/> <service service-name="getUserPreferenceGroup" - result-map-name="preferences"> + result-map="preferences"> <field-map field-name="userPrefGroupTypeId" value="MyPage" /> </service> </actions> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sun Feb 1 15:21:46 2009 @@ -45,7 +45,7 @@ <entity-condition entity-name="WorkEffort"> <condition-list combine="and"> <condition-expr field-name="workEffortTypeId" operator="equals" value="COMPANY_EVENT"/> - <condition-expr field-name="actualStartDate" operator="greater-equals" env-name="nowDate"/> + <condition-expr field-name="actualStartDate" operator="greater-equals" from-field="nowDate"/> </condition-list> <order-by field-name="actualStartDate"/> </entity-condition> @@ -225,15 +225,15 @@ <entity-condition entity-name="PartyContactWithPurpose" list="emailAddresses"> <condition-list combine="and"> <condition-expr field-name="partyId" value="${userLogin.partyId}"/> - <condition-expr field-name="contactFromDate" operator="less-equals" env-name="nowDate"/> + <condition-expr field-name="contactFromDate" operator="less-equals" from-field="nowDate"/> <condition-list combine="or"> - <condition-expr field-name="contactThruDate" env-name="null"/> - <condition-expr field-name="contactThruDate" operator="greater-equals" env-name="nowDate"/> + <condition-expr field-name="contactThruDate" from-field="null"/> + <condition-expr field-name="contactThruDate" operator="greater-equals" from-field="nowDate"/> </condition-list> - <condition-expr field-name="purposeFromDate" operator="less-equals" env-name="nowDate"/> + <condition-expr field-name="purposeFromDate" operator="less-equals" from-field="nowDate"/> <condition-list combine="or"> - <condition-expr field-name="purposeThruDate" operator="greater-equals" env-name="nowDate"/> - <condition-expr field-name="purposeThruDate" env-name="null"/> + <condition-expr field-name="purposeThruDate" operator="greater-equals" from-field="nowDate"/> + <condition-expr field-name="purposeThruDate" from-field="null"/> </condition-list> <condition-expr field-name="contactMechPurposeTypeId" operator="equals" value="PRIMARY_EMAIL"/> <condition-expr field-name="contactMechTypeId" operator="equals" value="EMAIL_ADDRESS"/> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sun Feb 1 15:21:46 2009 @@ -96,7 +96,7 @@ <actions> <set field="donePage" value="myTasks"/> <entity-and entity-name="WorkEffortAndPartyAssign" - list-name="tasks" filter-by-date="true"> + list="tasks" filter-by-date="true"> <field-map field-name="partyId" from-field="userLogin.partyId" /> <field-map field-name="workEffortTypeId" value="TASK" /> <field-map field-name="currentStatusId" value="PTS_CREATED" /> @@ -192,7 +192,7 @@ <actions> <set field="all" from-field="parameters.all"/> <entity-condition entity-name="CommunicationEventAndRole" - list-name="commEvents"> + list="commEvents"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="not-equals" value="COM_UNKNOWN_PARTY" /> @@ -206,7 +206,7 @@ <order-by field-name="-datetimeStarted" /> </entity-condition> <entity-condition entity-name="CommunicationEventAndRole" - list-name="commEventsUnknown"> + list="commEventsUnknown"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="equals" value="COM_UNKNOWN_PARTY" /> @@ -273,13 +273,13 @@ <section> <actions> <set field="donePage" value="otherCommunications"/> - <entity-and list-name="emailOwners" entity-name="PartyRelationship" filter-by-date="true"> + <entity-and list="emailOwners" entity-name="PartyRelationship" filter-by-date="true"> <field-map field-name="partyIdFrom" value="${userLogin.partyId}" /> <field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN" /> </entity-and> </actions> <widgets> - <iterate-section entry-name="emailOwner" list-name="emailOwners"> + <iterate-section entry="emailOwner" list="emailOwners"> <section> <actions> <set field="partyId" from-field="emailOwner.partyIdTo" /> @@ -324,9 +324,9 @@ <actions> <set field="parent" value="${uiLabelMap.CommonParent}"/> <entity-one entity-name="CommunicationEvent" - value-name="communicationEvent"> + value-field="communicationEvent"> <field-map field-name="communicationEventId" - env-name="communicationEvent.parentCommEventId" /> + from-field="communicationEvent.parentCommEventId" /> </entity-one> <set field="donePage" from-field="parameters.donePage"/> </actions> @@ -362,9 +362,9 @@ </section> <section> <actions> - <entity-and list-name="commEvents" entity-name="CommunicationEvent"> + <entity-and list="commEvents" entity-name="CommunicationEvent"> <field-map field-name="parentCommEventId" - env-name="parameters.communicationEventId" /> + from-field="parameters.communicationEventId" /> </entity-and> </actions> <widgets> @@ -403,21 +403,21 @@ <set field="showRequestManagementLinks" value="Y"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <entity-one entity-name="CustRequest" value-field="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"/> - <get-related-one value-name="custRequest" relation-name="FulfillContactMech" to-value-name="fulfillContactMech"/> - <entity-and list-name="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> + <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-one value-field="custRequest" relation-name="FulfillContactMech" to-value-field="fulfillContactMech"/> + <entity-and list="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> - <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="requestParties"/> + <get-related value-field="custRequest" relation-name="CustRequestParty" list="requestParties"/> <set field="orderBy[]" value="sequenceNum"/> - <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems" order-by-list-name="orderBy"/> - <entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest"> + <get-related value-field="custRequest" relation-name="CustRequestItem" list="custRequestItems" order-by-list="orderBy"/> + <entity-and list="commEvents" entity-name="CommunicationEventAndCustRequest"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> - <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents"> + <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> </actions> @@ -493,7 +493,7 @@ <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> <entity-condition list="invoices" entity-name="Invoice"> <condition-list combine="and"> - <condition-expr field-name="partyId" operator="equals" env-name="myCompanyId"/> + <condition-expr field-name="partyId" operator="equals" from-field="myCompanyId"/> <condition-list combine="or"> <condition-expr field-name="statusId" operator="equals" value="INVOICE_APPROVED"/> <condition-expr field-name="statusId" operator="equals" value="INVOICE_SEND"/> @@ -636,10 +636,10 @@ <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> - <entity-and entity-name="CommEventContentAssoc" list-name="commEventContent"> + <entity-and entity-name="CommEventContentAssoc" list="commEventContent"> <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/> </entity-and> - <entity-and entity-name="PartyContent" list-name="partyContent"> + <entity-and entity-name="PartyContent" list="partyContent"> <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-and> </actions> @@ -660,7 +660,7 @@ <set field="layoutSettings.styleSheets[]" value="/images/jsgantt.css" global="true"/> <entity-condition list="projects" entity-name="WorkEffortPartyAssignment" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="partyId" env-name="userLogin.partyId"/> + <condition-expr field-name="partyId" from-field="userLogin.partyId"/> <condition-list combine="or"> <condition-expr field-name="roleTypeId" value="CLIENT_MANAGER"/> <condition-expr field-name="roleTypeId" value="CLIENT_ANALYST"/> @@ -672,7 +672,7 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <iterate-section entry-name="project" list-name="projects"> + <iterate-section entry="project" list="projects"> <section> <actions> <set field="projectId" from-field="project.workEffortId"/> @@ -751,10 +751,10 @@ <set field="custRequestId" from-field="parameters.custRequestId"/> <entity-one entity-name="Content" value-field="content"/> <entity-one entity-name="CustRequest" value-field="custRequest"/> - <entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true"> + <entity-and entity-name="CustRequestContent" list="custRequestContents" filter-by-date="true"> <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> - <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents"> + <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> </actions> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sun Feb 1 15:21:46 2009 @@ -80,7 +80,7 @@ <entity-condition entity-name="WorkEffort"> <condition-list combine="and"> <condition-expr field-name="workEffortTypeId" operator="equals" value="COMPANY_EVENT"/> - <condition-expr field-name="actualStartDate" operator="greater-equals" env-name="nowDate"/> + <condition-expr field-name="actualStartDate" operator="greater-equals" from-field="nowDate"/> </condition-list> <order-by field-name="actualStartDate"/> </entity-condition> @@ -247,15 +247,15 @@ <entity-condition entity-name="PartyContactWithPurpose" list="emailAddresses"> <condition-list combine="and"> <condition-expr field-name="partyId" value="${userLogin.partyId}"/> - <condition-expr field-name="contactFromDate" operator="less-equals" env-name="nowDate"/> + <condition-expr field-name="contactFromDate" operator="less-equals" from-field="nowDate"/> <condition-list combine="or"> - <condition-expr field-name="contactThruDate" env-name="null"/> - <condition-expr field-name="contactThruDate" operator="greater-equals" env-name="nowDate"/> + <condition-expr field-name="contactThruDate" from-field="null"/> + <condition-expr field-name="contactThruDate" operator="greater-equals" from-field="nowDate"/> </condition-list> - <condition-expr field-name="purposeFromDate" operator="less-equals" env-name="nowDate"/> + <condition-expr field-name="purposeFromDate" operator="less-equals" from-field="nowDate"/> <condition-list combine="or"> - <condition-expr field-name="purposeThruDate" operator="greater-equals" env-name="nowDate"/> - <condition-expr field-name="purposeThruDate" env-name="null"/> + <condition-expr field-name="purposeThruDate" operator="greater-equals" from-field="nowDate"/> + <condition-expr field-name="purposeThruDate" from-field="null"/> </condition-list> <condition-expr field-name="contactMechPurposeTypeId" operator="equals" value="PRIMARY_EMAIL"/> <condition-expr field-name="contactMechTypeId" operator="equals" value="EMAIL_ADDRESS"/> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Feb 1 15:21:46 2009 @@ -97,7 +97,7 @@ <actions> <set field="portalPageId" value="myTasks"/> <entity-and entity-name="WorkEffortAndPartyAssign" - list-name="tasks" filter-by-date="true"> + list="tasks" filter-by-date="true"> <field-map field-name="partyId" from-field="userLogin.partyId" /> <field-map field-name="workEffortTypeId" value="TASK" /> <field-map field-name="currentStatusId" value="PTS_CREATED" /> @@ -193,7 +193,7 @@ <actions> <set field="all" from-field="parameters.all"/> <entity-condition entity-name="CommunicationEventAndRole" - list-name="commEvents"> + list="commEvents"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="not-equals" value="COM_UNKNOWN_PARTY" /> @@ -207,7 +207,7 @@ <order-by field-name="-datetimeStarted" /> </entity-condition> <entity-condition entity-name="CommunicationEventAndRole" - list-name="commEventsUnknown"> + list="commEventsUnknown"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="equals" value="COM_UNKNOWN_PARTY" /> @@ -218,7 +218,7 @@ </condition-list> <order-by field-name="-datetimeStarted" /> </entity-condition> - <entity-condition entity-name="CommunicationEventAndRole" list-name="commEventDraft"> + <entity-condition entity-name="CommunicationEventAndRole" list="commEventDraft"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="equals" value="COM_PENDING"/> @@ -274,13 +274,13 @@ <section> <actions> <set field="portalPageId" value="otherCommunications"/> - <entity-and list-name="emailOwners" entity-name="PartyRelationship" filter-by-date="true"> + <entity-and list="emailOwners" entity-name="PartyRelationship" filter-by-date="true"> <field-map field-name="partyIdFrom" value="${userLogin.partyId}" /> <field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN" /> </entity-and> </actions> <widgets> - <iterate-section entry-name="emailOwner" list-name="emailOwners"> + <iterate-section entry="emailOwner" list="emailOwners"> <section> <actions> <set field="partyId" from-field="emailOwner.partyIdTo" /> @@ -325,9 +325,9 @@ <actions> <set field="parent" value="${uiLabelMap.CommonParent}"/> <entity-one entity-name="CommunicationEvent" - value-name="communicationEvent"> + value-field="communicationEvent"> <field-map field-name="communicationEventId" - env-name="communicationEvent.parentCommEventId" /> + from-field="communicationEvent.parentCommEventId" /> </entity-one> <set field="portalPageId" from-field="parameters.portalPageId"/> </actions> @@ -363,9 +363,9 @@ </section> <section> <actions> - <entity-and list-name="commEvents" entity-name="CommunicationEvent"> + <entity-and list="commEvents" entity-name="CommunicationEvent"> <field-map field-name="parentCommEventId" - env-name="parameters.communicationEventId" /> + from-field="parameters.communicationEventId" /> </entity-and> </actions> <widgets> @@ -404,21 +404,21 @@ <set field="showRequestManagementLinks" value="Y"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <entity-one entity-name="CustRequest" value-field="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"/> - <get-related-one value-name="custRequest" relation-name="FulfillContactMech" to-value-name="fulfillContactMech"/> - <entity-and list-name="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> + <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-one value-field="custRequest" relation-name="FulfillContactMech" to-value-field="fulfillContactMech"/> + <entity-and list="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> - <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="requestParties"/> + <get-related value-field="custRequest" relation-name="CustRequestParty" list="requestParties"/> <set field="orderBy[]" value="sequenceNum"/> - <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems" order-by-list-name="orderBy"/> - <entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest"> + <get-related value-field="custRequest" relation-name="CustRequestItem" list="custRequestItems" order-by-list="orderBy"/> + <entity-and list="commEvents" entity-name="CommunicationEventAndCustRequest"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> - <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents"> + <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> </actions> @@ -492,9 +492,9 @@ <actions> <set field="headerItem" value="invoices"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> - <entity-condition list-name="invoices" entity-name="Invoice"> + <entity-condition list="invoices" entity-name="Invoice"> <condition-list combine="and"> - <condition-expr field-name="partyId" operator="equals" env-name="myCompanyId"/> + <condition-expr field-name="partyId" operator="equals" from-field="myCompanyId"/> <condition-list combine="or"> <condition-expr field-name="statusId" operator="equals" value="INVOICE_APPROVED"/> <condition-expr field-name="statusId" operator="equals" value="INVOICE_SEND"/> @@ -608,7 +608,7 @@ <screen name="addAttachmentEmail"> <section> <actions> - <entity-condition entity-name="MimeType" list-name="mimeTypes"> + <entity-condition entity-name="MimeType" list="mimeTypes"> <order-by field-name="description"/> <order-by field-name="mimeTypeId"/> </entity-condition> @@ -635,10 +635,10 @@ <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> - <entity-and entity-name="CommEventContentAssoc" list-name="commEventContent"> + <entity-and entity-name="CommEventContentAssoc" list="commEventContent"> <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/> </entity-and> - <entity-and entity-name="PartyContent" list-name="partyContent"> + <entity-and entity-name="PartyContent" list="partyContent"> <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-and> </actions> @@ -657,9 +657,9 @@ <set field="headerItem" value="projects"/> <set field="layoutSettings.javaScripts[]" value="/images/jsgantt.js" global="true"/> <set field="layoutSettings.styleSheets[]" value="/images/jsgantt.css" global="true"/> - <entity-condition list-name="projects" entity-name="WorkEffortPartyAssignment" filter-by-date="true"> + <entity-condition list="projects" entity-name="WorkEffortPartyAssignment" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="partyId" env-name="userLogin.partyId"/> + <condition-expr field-name="partyId" from-field="userLogin.partyId"/> <condition-list combine="or"> <condition-expr field-name="roleTypeId" value="CLIENT_MANAGER"/> <condition-expr field-name="roleTypeId" value="CLIENT_ANALYST"/> @@ -669,7 +669,7 @@ </entity-condition> </actions> <widgets> - <iterate-section entry-name="project" list-name="projects"> + <iterate-section entry="project" list="projects"> <section> <actions> <set field="projectId" from-field="project.workEffortId"/> @@ -746,10 +746,10 @@ <set field="custRequestId" from-field="parameters.custRequestId"/> <entity-one entity-name="Content" value-field="content"/> <entity-one entity-name="CustRequest" value-field="custRequest"/> - <entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true"> + <entity-and entity-name="CustRequestContent" list="custRequestContents" filter-by-date="true"> <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> - <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents"> + <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> </actions> @@ -773,12 +773,12 @@ <field-map field-name="userPrefGroupTypeId" value="MyPortal"/> </service> <!-- check if there are any customer requests for this user --> - <entity-condition list-name="custRequests" entity-name="CustReqAndTypeAndPartyRel"> + <entity-condition list="custRequests" entity-name="CustReqAndTypeAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/> <condition-list combine="and"> <condition-expr field-name="roleTypeIdTo" operator="equals" value="REQ_TAKER"/> - <condition-expr field-name="partyIdTo" operator="equals" env-name="userLogin.partyId"/> + <condition-expr field-name="partyIdTo" operator="equals" from-field="userLogin.partyId"/> </condition-list> </condition-list> <order-by field-name="-custRequestDate"/> @@ -806,7 +806,7 @@ <set field="portalPageId" from-field="parameters.portalPageId"/> <set field="status" from-field="parameters.status" default-value="open"/> <set field="status" value="${bsh:"all".equals(status)?"%":"open"}"/> - <entity-condition list-name="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> <condition-list combine="or"> @@ -817,7 +817,7 @@ <order-by field-name="+priority"/> <order-by field-name="+custRequestDate"/> </entity-condition> - <entity-condition list-name="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <entity-condition list="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> <condition-list combine="or"> @@ -828,7 +828,7 @@ <order-by field-name="custRequestDate"/> </entity-condition> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> - <entity-condition list-name="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <entity-condition list="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/> <condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/> @@ -836,7 +836,7 @@ <order-by field-name="custRequestDate"/> </entity-condition> <!-- only list internal notes to the customer do not show the incoming or outgoing emails: will confuse only --> - <entity-condition entity-name="CommunicationEventAndRole" list-name="commEvents"> + <entity-condition entity-name="CommunicationEventAndRole" list="commEvents"> <condition-list combine="and"> <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" /> <condition-expr field-name="partyId" operator="equals" value="${partyId}" /> @@ -869,7 +869,7 @@ <set field="partyId" from-field="userLogin.partyId"/> <set field="status" from-field="parameters.status" default-value="open"/> <set field="status" value="${bsh:"all".equals(status)?"%":"open"}"/> - <entity-condition list-name="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> <condition-list combine="or"> @@ -880,7 +880,7 @@ <order-by field-name="+priority"/> <order-by field-name="+custRequestDate"/> </entity-condition> - <entity-condition list-name="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <entity-condition list="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> <condition-list combine="or"> @@ -891,7 +891,7 @@ <order-by field-name="custRequestDate"/> </entity-condition> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> - <entity-condition list-name="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <entity-condition list="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/> <condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/> @@ -899,7 +899,7 @@ <order-by field-name="custRequestDate"/> </entity-condition> <!-- only list internal notes to the customer do not show the incoming or outgoing emails: will confuse only --> - <entity-condition entity-name="CommunicationEventAndRole" list-name="commEvents"> + <entity-condition entity-name="CommunicationEventAndRole" list="commEvents"> <condition-list combine="and"> <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" /> <condition-expr field-name="partyId" operator="equals" value="${partyId}" /> @@ -931,7 +931,7 @@ <set field="partyId" from-field="userLogin.partyId"/> <set field="status" from-field="parameters.status" default-value="open"/> <set field="status" value="${bsh:"all".equals(status)?"%":"open"}"/> - <entity-condition list-name="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> <condition-list combine="or"> @@ -942,7 +942,7 @@ <order-by field-name="+priority"/> <order-by field-name="+custRequestDate"/> </entity-condition> - <entity-condition list-name="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <entity-condition list="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> <condition-list combine="or"> @@ -953,7 +953,7 @@ <order-by field-name="custRequestDate"/> </entity-condition> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> - <entity-condition list-name="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <entity-condition list="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/> <condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/> @@ -961,7 +961,7 @@ <order-by field-name="custRequestDate"/> </entity-condition> <!-- only list internal notes to the customer do not show the incoming or outgoing emails: will confuse only --> - <entity-condition entity-name="CommunicationEventAndRole" list-name="commEvents"> + <entity-condition entity-name="CommunicationEventAndRole" list="commEvents"> <condition-list combine="and"> <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" /> <condition-expr field-name="partyId" operator="equals" value="${partyId}" /> @@ -1001,7 +1001,7 @@ <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> - <entity-and entity-name="PartyContent" list-name="partyContent"> + <entity-and entity-name="PartyContent" list="partyContent"> <field-map field-name="partyId" from-field="parameters.partyId"/> </entity-and> </actions> Modified: ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml Sun Feb 1 15:21:46 2009 @@ -24,7 +24,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="entityName" value="OagisMessageInfo"/> - <service service-name="performFind" result-map="result" result-map-list-name="listIt"> + <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> </service> @@ -62,7 +62,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="entityName" value="OagisMessageErrorInfo"/> - <service service-name="performFind" result-map="result" result-map-list-name="listIt"> + <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> </service> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sun Feb 1 15:21:46 2009 @@ -27,7 +27,7 @@ <set field="tabButtonItem" value="subprojects"/> <set field="labelTitleProperty" value="ProjectMgrProjectName"/> <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/> - <entity-and entity-name="WorkEffort" list-name="projects"> + <entity-and entity-name="WorkEffort" list="projects"> <field-map field-name="workEffortTypeId" value="PROJECT"/> <field-map field-name="workEffortParentId" from-field="projectId"/> </entity-and> @@ -205,12 +205,12 @@ <set field="tabButtonItem" value="tasks"/> <set field="labelTitleProperty" value="PageTitleFindTask"/> <set field="projectId" from-field="parameters.projectId"/> - <entity-and entity-name="ProjectAndPhaseAndTask" list-name="tasks"> + <entity-and entity-name="ProjectAndPhaseAndTask" list="tasks"> <field-map field-name="projectId" from-field="parameters.projectId"/> <order-by field-name="phaseName"/> <order-by field-name="workEffortName"/> </entity-and> - <entity-and entity-name="WorkEffort" list-name="phases"> + <entity-and entity-name="WorkEffort" list="phases"> <field-map field-name="workEffortParentId" from-field="parameters.projectId"/> <field-map field-name="workEffortTypeId" value="PHASE"/> </entity-and> @@ -386,7 +386,7 @@ <set field="tabButtonItem" value="projectskills"/> <set field="labelTitleProperty" value="PageTitleEditSkill"/> <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/> - <entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandardList"> + <entity-and entity-name="WorkEffortSkillStandard" list="workEffortSkillStandardList"> <field-map field-name="workEffortId"/> </entity-and> </actions> @@ -581,9 +581,9 @@ <screen name="PartiesInfo"> <section> <actions> - <entity-condition entity-name="WorkEffortPartyAssignView" list-name="clientAssigns" distinct="true" filter-by-date="true"> + <entity-condition entity-name="WorkEffortPartyAssignView" list="clientAssigns" distinct="true" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="workEffortId" env-name="parameters.projectId" operator="equals"/> + <condition-expr field-name="workEffortId" from-field="parameters.projectId" operator="equals"/> <condition-expr field-name="roleTypeId" value="CLIENT%" operator="like"/> <condition-expr field-name="roleTypeId" value="CLIENT_BILLING" operator="not-equals"/> </condition-list> @@ -597,9 +597,9 @@ <order-by field-name="firstName"/> <order-by field-name="groupName"/> </entity-condition> - <entity-condition entity-name="WorkEffortPartyAssignView" list-name="companyAssigns" distinct="true" filter-by-date="true"> + <entity-condition entity-name="WorkEffortPartyAssignView" list="companyAssigns" distinct="true" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="workEffortId" env-name="parameters.projectId" operator="equals"/> + <condition-expr field-name="workEffortId" from-field="parameters.projectId" operator="equals"/> <condition-list combine="or"> <condition-expr field-name="roleTypeId" value="INTERNAL_ORGANIZATIO" operator="equals"/> <condition-expr field-name="roleTypeId" value="CLIENT_BILLING" operator="equals"/> @@ -618,7 +618,7 @@ </actions> <widgets> <screenlet title="${uiLabelMap.ProjectMgrResources}"> - <label style="h3" title="${uiLabelMap.ProjectMgrProviders}"/> + <label style="h3" text="${uiLabelMap.ProjectMgrProviders}"/> <include-form name="ListProjectProviderParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/> <section> <condition> @@ -646,7 +646,7 @@ <section> <actions> <set field="workEffortId" from-field="projectId"/> - <entity-and entity-name="WorkEffortNoteAndData" list-name="workEffortNoteandDetails"> + <entity-and entity-name="WorkEffortNoteAndData" list="workEffortNoteandDetails"> <field-map field-name="workEffortId" from-field="workEffortId"/> <order-by field-name="-noteDateTime"/> </entity-and> @@ -665,7 +665,7 @@ <set field="tabButtonItem" value="listResourcesProject"/> <set field="titleProperty" value="PageTitleListProjectByParty"/> <set field="workEffortId" from-field="parameters.projectId"/> - <entity-and entity-name="WorkEffortAndPartyAssign" list-name="parties"> + <entity-and entity-name="WorkEffortAndPartyAssign" list="parties"> <field-map field-name="workEffortTypeId" value="PROJECT"/> <field-map field-name="partyId" from-field="parameters.partyId"/> <order-by field-name="workEffortId"/> @@ -698,7 +698,7 @@ <set field="tabButtonItem" value="listResourcesTask"/> <set field="titleProperty" value="PageTitleListTaskByParty"/> <set field="workEffortId" from-field="parameters.projectId"/> - <entity-and entity-name="WorkEffortAndPartyAssign" list-name="tasks"> + <entity-and entity-name="WorkEffortAndPartyAssign" list="tasks"> <field-map field-name="partyId" from-field="parameters.partyId"/> <field-map field-name="workEffortTypeId" value="TASK"/> <field-map field-name="statusId" value="PRTYASGN_ASSIGNED"/> @@ -1049,7 +1049,7 @@ <entity-one entity-name="Content" value-field="content"/> <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/> <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/> - <entity-and entity-name="WorkEffortAndContentDataResource" list-name="workEffortAndContentDataResources"> + <entity-and entity-name="WorkEffortAndContentDataResource" list="workEffortAndContentDataResources"> <field-map field-name="workEffortId" from-field="projectId"/> </entity-and> </actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Sun Feb 1 15:21:46 2009 @@ -26,7 +26,7 @@ <set field="titleProperty" value="PageTitleListWorkEffortRequests"/> <set field="tabButtonItem" value="requestlist"/> <set field="headerItem" value="request"/> - <entity-and list-name="custRequests" entity-name="CustRequest"> + <entity-and list="custRequests" entity-name="CustRequest"> <field-map field-name="statusId" value="CRQ_ACCEPTED"/> <order-by field-name="lastModifiedDate"/> </entity-and> @@ -81,28 +81,28 @@ <set field="showRequestManagementLinks" value="Y"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <entity-one entity-name="CustRequest" value-field="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"/> - <get-related-one value-name="custRequest" relation-name="FulfillContactMech" to-value-name="fulfillContactMech"/> - <entity-and list-name="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> + <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-one value-field="custRequest" relation-name="FulfillContactMech" to-value-field="fulfillContactMech"/> + <entity-and list="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> - <get-related value-name="custRequest" relation-name="CustRequestParty" list-name="requestParties"/> + <get-related value-field="custRequest" relation-name="CustRequestParty" list="requestParties"/> <set field="orderBy[]" value="sequenceNum"/> - <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="custRequestItems" order-by-list-name="orderBy"/> - <entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest"> + <get-related value-field="custRequest" relation-name="CustRequestItem" list="custRequestItems" order-by-list="orderBy"/> + <entity-and list="commEvents" entity-name="CommunicationEventAndCustRequest"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> <entity-condition entity-name="CustRequestItemNoteView" list="custRequestItemNoteViews"> - <condition-expr field-name="custRequestId" operator="equals" env-name="parameters.custRequestId"/> + <condition-expr field-name="custRequestId" operator="equals" from-field="parameters.custRequestId"/> <order-by field-name="-noteDateTime"/> </entity-condition> - <entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true"> + <entity-and entity-name="CustRequestContent" list="custRequestContents" filter-by-date="true"> <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> - <entity-and entity-name="CustRequestAndContent" list-name="custRequestAndContents"> + <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> </actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sun Feb 1 15:21:46 2009 @@ -37,7 +37,7 @@ <decorator-section name="body"> <section> <actions> - <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true"> + <entity-and entity-name="WorkEffortAssocView" list="depList" filter-by-date="true"> <field-map field-name="workEffortIdTo" from-field="parameters.workEffortId"/> <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/> </entity-and> @@ -53,7 +53,7 @@ </section> <section> <actions> - <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true"> + <entity-and entity-name="WorkEffortAssocView" list="depList" filter-by-date="true"> <field-map field-name="workEffortIdFrom" from-field="parameters.workEffortId"/> <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/> </entity-and> @@ -78,7 +78,7 @@ <set field="titleProperty" value="WorkEffortMyTasks"/> <set field="headerItem" value="mytasks"/> <set field="labelTitleProperty" value="ProjectMgrMyTasks"/> - <entity-and entity-name="WorkEffortAndPartyAssign" list-name="projects" filter-by-date="true"> + <entity-and entity-name="WorkEffortAndPartyAssign" list="projects" filter-by-date="true"> <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="workEffortTypeId" value="PROJECT"/> </entity-and> @@ -125,7 +125,7 @@ <screen name="MyTaskList"> <section> <actions> - <entity-and entity-name="WorkEffortAndPartyAssign" list-name="tasks" filter-by-date="true"> + <entity-and entity-name="WorkEffortAndPartyAssign" list="tasks" filter-by-date="true"> <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="workEffortTypeId" value="TASK"/> <field-map field-name="currentStatusId" value="PTS_CREATED"/> @@ -249,7 +249,7 @@ <set field="tabButtonItem" value="projectskills"/> <set field="labelTitleProperty" value="PageTitleEditSkill"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandards"> + <entity-and entity-name="WorkEffortSkillStandard" list="workEffortSkillStandards"> <field-map field-name="workEffortId" from-field="workEffortId"/> </entity-and> </actions> @@ -454,7 +454,7 @@ <section> <actions> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-and entity-name="WorkEffortNoteAndData" list-name="workEffortNoteandDetails"> + <entity-and entity-name="WorkEffortNoteAndData" list="workEffortNoteandDetails"> <field-map field-name="workEffortId" from-field="workEffortId"/> <order-by field-name="-noteDateTime"/> </entity-and> @@ -504,7 +504,7 @@ <screen name="taskBefore"> <section> <actions> - <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true"> + <entity-and entity-name="WorkEffortAssocView" list="depList" filter-by-date="true"> <field-map field-name="workEffortIdTo" from-field="parameters.workEffortId"/> <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/> </entity-and> @@ -530,7 +530,7 @@ <screen name="taskAfter"> <section> <actions> - <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true"> + <entity-and entity-name="WorkEffortAssocView" list="depList" filter-by-date="true"> <field-map field-name="workEffortIdFrom" from-field="parameters.workEffortId"/> <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/> </entity-and> @@ -594,7 +594,7 @@ <set field="contentId" from-field="parameters.contentId"/> <entity-one entity-name="Content" value-field="content"/> <set field="workEffortId" from-field="parameters.workEffortId" default-value="${parameters.workEffortId}"/> - <entity-and entity-name="WorkEffortAndContentDataResource" list-name="workEffortAndContentDataResources"> + <entity-and entity-name="WorkEffortAndContentDataResource" list="workEffortAndContentDataResources"> <field-map field-name="workEffortId" from-field="workEffortId"/> </entity-and> </actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml?rev=739779&r1=739778&r2=739779&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml Sun Feb 1 15:21:46 2009 @@ -27,7 +27,7 @@ <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/ProjectScreens.xml"/> <sub-node node-name="node-list"> <entity-condition entity-name="WorkEffortAssoc"> - <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortId"/> + <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/> </entity-condition> </sub-node> </node> @@ -38,7 +38,7 @@ <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/ProjectScreens.xml"/> <sub-node node-name="node-list"> <entity-condition entity-name="WorkEffortAssoc"> - <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortAssoc.workEffortIdTo"/> + <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortAssoc.workEffortIdTo"/> </entity-condition> </sub-node> </node> @@ -50,7 +50,7 @@ <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/TaskScreens.xml"/> <sub-node node-name="node-list"> <entity-condition entity-name="WorkEffortAssoc"> - <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortId"/> + <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/> </entity-condition> </sub-node> </node> @@ -61,7 +61,7 @@ <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/TaskScreens.xml"/> <sub-node node-name="node-list"> <entity-condition entity-name="WorkEffortAssoc"> - <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortAssoc.workEffortIdTo"/> + <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortAssoc.workEffortIdTo"/> </entity-condition> </sub-node> </node> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |