You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/02/01 16:13:38 UTC
svn commit: r739776 - in /ofbiz/trunk/applications/workeffort:
script/org/ofbiz/workeffort/workeffort/ widget/
Author: mrisaliti
Date: Sun Feb 1 15:13:37 2009
New Revision: 739776
URL: http://svn.apache.org/viewvc?rev=739776&view=rev
Log:
Artifact cleaning on workeffort component after recent changes on xsd files (OFBIZ-2137)
Modified:
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Sun Feb 1 15:13:37 2009
@@ -211,8 +211,8 @@
<set field="eventWe.description" from-field="parameters.relationDescription"/>
<create-value value-field="lookupMap"/>
</if-empty>
- <field-to-result field="workEffortId" map-name="lookupMap"/>
- <field-to-result field="communicationEventId" map-name="lookupMap"/>
+ <field-to-result field="workEffortId" result-name="lookupMap"/>
+ <field-to-result field="communicationEventId" result-name="lookupMap"/>
</simple-method>
<simple-method method-name="updateCommunicationEventWorkEff" short-description="Delete a CommunicationEventWorkEff">
@@ -341,7 +341,7 @@
<log level="info" message="Creating a WorkEffortContactMech"/>
<set from-field="parameters.workEffortId" field="newValue.workEffortId"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
<field-to-request field="contactMechId" map-name="newValue"/>
<create-value value-field="newValue"/>
</simple-method>
@@ -379,7 +379,7 @@
<remove-value value-field="workEffortContactMech"/>
</if-compare-field>
- <field-to-result field="contactMechId" map-name="newWorkEffortContactMech"/>
+ <field-to-result field="contactMechId" result-name="newWorkEffortContactMech"/>
<field-to-request field="contactMechId" map-name="newWorkEffortContactMech"/>
</simple-method>
@@ -422,7 +422,7 @@
<default-message>WorkEffort Contact Mechanism successfully created</default-message>
</call-service>
<field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
<simple-method method-name="updateWorkEffortPostalAddress" short-description="Update a PostalAddress for WorkEffort">
@@ -442,7 +442,7 @@
<default-message>WorkEffort Contact Mechanism successfully updated</default-message>
</call-service>
<field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
<simple-method method-name="createWorkEffortTelecomNumber" short-description="Create a TelecomNumber for WorkEffort">
@@ -473,7 +473,7 @@
<default-message>WorkEffort Contact Mechanism successfully created</default-message>
</call-service>
<field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
<simple-method method-name="updateWorkEffortTelecomNumber" short-description="Update a TelecomNumber for WorkEffort">
@@ -495,7 +495,7 @@
</call-service>
<log level="info" message="Setting result id: ${newValue.contactMechId}"/>
<field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
<simple-method method-name="createWorkEffortEmailAddress" short-description="Create an email address for WorkEffort">
@@ -700,7 +700,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
<create-value value-field="lookupMap"/>
- <field-to-result field="custRequestId" map-name="lookupMap"/>
+ <field-to-result field="custRequestId" result-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteWorkEffortRequest" short-description="Delete a CustRequestWorkEffort">
<entity-one entity-name="CustRequestWorkEffort" value-field="custRequestWorkEffort"/>
@@ -756,7 +756,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
<create-value value-field="lookupMap"/>
- <field-to-result field="quoteId" map-name="lookupMap"/>
+ <field-to-result field="quoteId" result-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteWorkEffortQuote" short-description="Delete a QuoteWorkEffort">
<entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort"/>
@@ -778,7 +778,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
<create-value value-field="lookupMap"/>
- <field-to-result field="requirementId" map-name="lookupMap"/>
+ <field-to-result field="requirementId" result-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteWorkRequirementFulfillment" short-description="Delete a WorkRequirementFulfillment">
<entity-one entity-name="WorkRequirementFulfillment" value-field="workRequirementFulfillment"/>
@@ -800,7 +800,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
<create-value value-field="lookupMap"/>
- <field-to-result field="shoppingListId" map-name="lookupMap"/>
+ <field-to-result field="shoppingListId" result-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteShoppingListWorkEffort" short-description="Delete a ShoppingListWorkEffort">
<entity-one entity-name="ShoppingListWorkEffort" value-field="shoppingListWorkEffort"/>
@@ -822,7 +822,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
<create-value value-field="lookupMap"/>
- <field-to-result field="orderId" map-name="lookupMap"/>
+ <field-to-result field="orderId" result-name="lookupMap"/>
</simple-method>
<simple-method method-name="deleteOrderHeaderWorkEffort" short-description="Delete a OrderHeaderWorkEffort">
<entity-one entity-name="OrderHeaderWorkEffort" value-field="orderWorkEffort"/>
Modified: ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupForms.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/LookupForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/LookupForms.xml Sun Feb 1 15:13:37 2009
@@ -135,7 +135,7 @@
<form name="listLookupWorkEffort" list-name="listIt" target="" title="" type="list" paginate-target="LookupWorkEffort"
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="WorkEffort"/>
<field-map field-name="orderBy" value="workEffortId"/>
@@ -164,7 +164,7 @@
<form name="listLookupTimesheet" list-name="listIt" target="" title="" type="list" paginate-target="LookupPerson"
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="Timesheet"/>
<field-map field-name="orderBy" value="timesheetId"/>
Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml Sun Feb 1 15:13:37 2009
@@ -22,7 +22,7 @@
<form name="ListMyTimesheets" target="" title="" type="list" list-name="timesheets" paginate-target="MyTimesheets" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="Timesheet" list-name="timesheets">
+ <entity-and entity-name="Timesheet" list="timesheets">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<order-by field-name="-fromDate"/>
</entity-and>
@@ -37,7 +37,7 @@
<form name="ListMyRates" target="" title="" type="list" list-name="partyRates" paginate="false"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="PartyRate" list-name="partyRates">
+ <entity-and entity-name="PartyRate" list="partyRates">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<order-by field-name="-fromDate"/>
</entity-and>
@@ -75,7 +75,7 @@
<form name="ListFindTimesheet" target="" title="" type="list" list-name="listIt" paginate-target="FindTimesheet" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+ <service result-map-list="listIt" result-map="result" service-name="performFind">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Timesheet"/>
</service>
@@ -112,7 +112,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TimeEntry">
- <condition-expr field-name="timesheetId" env-name="timesheetId"/>
+ <condition-expr field-name="timesheetId" from-field="timesheetId"/>
<order-by field-name="partyId"/>
<order-by field-name="rateTypeId"/>
<order-by field-name="-fromDate"/>
@@ -147,7 +147,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TimesheetRole">
- <condition-expr field-name="timesheetId" env-name="timesheetId"/>
+ <condition-expr field-name="timesheetId" from-field="timesheetId"/>
<order-by field-name="roleTypeId"/>
</entity-condition>
</actions>
@@ -182,7 +182,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TimeEntry">
- <condition-expr field-name="timesheetId" env-name="timesheetId"/>
+ <condition-expr field-name="timesheetId" from-field="timesheetId"/>
<order-by field-name="partyId"/>
<order-by field-name="rateTypeId"/>
<order-by field-name="-fromDate"/>
Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml Sun Feb 1 15:13:37 2009
@@ -31,11 +31,11 @@
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
<entity-condition entity-name="Timesheet" list="currentTimesheetList">
<condition-list combine="and">
- <condition-expr field-name="partyId" env-name="userLogin.partyId"/>
- <condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
+ <condition-expr field-name="partyId" from-field="userLogin.partyId"/>
+ <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/>
<condition-list combine="or">
- <condition-expr field-name="thruDate" operator="greater-equals" env-name="nowTimestamp"/>
- <condition-expr field-name="thruDate" env-name="null"/>
+ <condition-expr field-name="thruDate" operator="greater-equals" from-field="nowTimestamp"/>
+ <condition-expr field-name="thruDate" from-field="null"/>
</condition-list>
</condition-list>
</entity-condition>
@@ -52,13 +52,13 @@
<container style="screenlet-body">
<link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek?partyId=${userLogin.partyId}" style="buttontext"/>
<link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet?partyId=${userLogin.partyId}" style="buttontext"/>
- <iterate-section entry-name="currentTimesheet" list-name="currentTimesheetList">
+ <iterate-section entry="currentTimesheet" list="currentTimesheetList">
<section>
<actions>
<entity-condition entity-name="TimeEntry" list="currentTimeEntryList">
<condition-list combine="and">
- <condition-expr field-name="partyId" env-name="userLogin.partyId"/>
- <condition-expr field-name="timesheetId" env-name="currentTimesheet.timesheetId"/>
+ <condition-expr field-name="partyId" from-field="userLogin.partyId"/>
+ <condition-expr field-name="timesheetId" from-field="currentTimesheet.timesheetId"/>
</condition-list>
</entity-condition>
</actions>
@@ -67,7 +67,7 @@
<label style="tableheadtext" text="${uiLabelMap.WorkEffortTimesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/>
<link target="EditTimesheet?timesheetId=${currentTimesheet.timesheetId}" text="${currentTimesheet.timesheetId}" style="buttontext"></link>
</container>
- <iterate-section entry-name="currentTimeEntry" list-name="currentTimeEntryList">
+ <iterate-section entry="currentTimeEntry" list="currentTimeEntryList">
<section>
<actions>
<entity-one entity-name="RateType" value-field="currentRateType" auto-field-map="false">
@@ -88,7 +88,7 @@
</section>
</iterate-section>
<section>
- <condition><if-compare-field field-name="parameters.showQuickEntry" operator="equals" to-field-name="currentTimesheet.timesheetId"/></condition>
+ <condition><if-compare-field field="parameters.showQuickEntry" operator="equals" to-field="currentTimesheet.timesheetId"/></condition>
<widgets>
<include-form name="QuickCreateTimeEntry" location="component://workeffort/widget/TimesheetForms.xml"/>
</widgets>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml Sun Feb 1 15:13:37 2009
@@ -24,7 +24,7 @@
<actions>
<entity-condition entity-name="WorkEffortCommunicationEventView">
<condition-list combine="and">
- <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" operator="equals" from-field="workEffortId"/>
</condition-list>
<order-by field-name="communicationEventId"/>
</entity-condition>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Feb 1 15:13:37 2009
@@ -263,7 +263,7 @@
<form name="ListLookupWorkEffort" target="" title="" list-name="listIt" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+ <service result-map-list="listIt" result-map="result" service-name="performFind">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="WorkEffort"/>
</service>
@@ -383,7 +383,7 @@
<form name="ListWorkEfforts" type="list" list-name="listIt" paginate-target="ListWorkEfforts"
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="WorkEffort"/>
<field-map field-name="orderBy" value="lastModifiedDate DESC"/>
@@ -467,7 +467,7 @@
<form name="ListWorkEffortParties" list-name="listIt" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+ <service result-map-list="listIt" result-map="result" service-name="performFind">
<field-map from-field="parameters" field-name="inputFields"/>
<field-map from-field="entityName" field-name="entityName"/>
</service>
@@ -593,7 +593,7 @@
<form name="ListWorkEffortCommEvents" default-map-name="workEffortCommEvent" title="" list-name="listIt" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+ <service result-map-list="listIt" result-map="result" service-name="performFind">
<field-map from-field="requestParameters" field-name="inputFields"/>
<field-map from-field="entityName" field-name="entityName"/>
</service>
@@ -672,7 +672,7 @@
<form name="ListLookupCommEvent" target="" title="" list-name="listIt" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+ <service result-map-list="listIt" result-map="result" service-name="performFind">
<field-map from-field="parameters" field-name="inputFields"/>
<field-map from-field="entityName" field-name="entityName"/>
</service>
@@ -709,7 +709,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="RateAmount" filter-by-date="true">
- <condition-expr field-name="workEffortId" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" from-field="workEffortId"/>
<order-by field-name="rateTypeId"/>
<order-by field-name="periodTypeId"/>
<order-by field-name="rateCurrencyUomId"/>
@@ -762,7 +762,7 @@
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TimeEntry">
- <condition-expr field-name="workEffortId" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" from-field="workEffortId"/>
<order-by field-name="timesheetId"/>
<order-by field-name="partyId"/>
<order-by field-name="rateTypeId"/>
@@ -841,7 +841,7 @@
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition 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>
</actions>
@@ -900,7 +900,7 @@
<form name="ListWorkEffortContents" type="list" target="updateWorkEffortContent" list-name="workEffortContents"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="WorkEffortContent" use-cache="true" list-name="workEffortContents">
+ <entity-and entity-name="WorkEffortContent" use-cache="true" list="workEffortContents">
<field-map from-field="workEffortId" field-name="workEffortId" />
</entity-and>
</actions>
@@ -947,7 +947,7 @@
<form name="ListWorkEffortGoodStandards" type="list" target="updateWorkEffortGoodStandard" list-name="workEffortGoodStandards"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list-name="workEffortGoodStandards">
+ <entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list="workEffortGoodStandards">
<field-map from-field="workEffortId" field-name="workEffortId" />
</entity-and>
</actions>
@@ -997,7 +997,7 @@
<form name="ListWorkEffortReviews" type="list" target="updateWorkEffortReview" list-name="productWorkEfforts" separate-columns="true"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="WorkEffortReview" use-cache="true" list-name="workEffortReviews">
+ <entity-and entity-name="WorkEffortReview" use-cache="true" list="workEffortReviews">
<field-map from-field="workEffortId" field-name="workEffortId" />
</entity-and>
</actions>
@@ -1034,7 +1034,7 @@
<form name="ListWorkEffortKeywords" type="list" target="" list-name="listWorkEffortKeywords"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="WorkEffortKeyword" use-cache="true" list-name="workEffortkeywords">
+ <entity-and entity-name="WorkEffortKeyword" use-cache="true" list="workEffortkeywords">
<field-map from-field="workEffortId" field-name="workEffortId" />
</entity-and>
</actions>
@@ -1057,7 +1057,7 @@
<form name="ListWorkEffortContactMechs" type="list" target="" list-name="workEffortContactMechs"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="WorkEffortContactMech" list-name="workEffortContactMechs">
+ <entity-and entity-name="WorkEffortContactMech" list="workEffortContactMechs">
<field-map from-field="workEffortId" field-name="workEffortId" />
</entity-and>
</actions>
@@ -1091,7 +1091,7 @@
<form name="ListAgreementWorkEffortAppls" type="list" target="updateAgreementWorkEffortAppl" list-name="agreementWorkEffortAppls"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list-name="agreementWorkEffortAppls">
+ <entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list="agreementWorkEffortAppls">
<field-map from-field="workEffortId" field-name="workEffortId" />
</entity-and>
</actions>
@@ -1111,7 +1111,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="WorkEffortFixedAssetAssign" filter-by-date="true">
- <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" operator="equals" from-field="workEffortId"/>
<order-by field-name="-fromDate"/>
</entity-condition>
</actions>
@@ -1194,7 +1194,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="WorkEffortEventReminder">
- <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" operator="equals" from-field="workEffortId"/>
<order-by field-name="-reminderDateTime"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml Sun Feb 1 15:13:37 2009
@@ -24,7 +24,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="WorkEffortPartyAssignment">
- <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" operator="equals" from-field="workEffortId"/>
<order-by field-name="roleTypeId"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml Sun Feb 1 15:13:37 2009
@@ -29,27 +29,27 @@
<set field="workEffortId" from-field="parameters.workEffortId"/>
<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="workEffort" relation-name="ScopeEnumeration" to-value-name="scopeEnumeration"/>
+ <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="workEffort" relation-name="ScopeEnumeration" to-value-field="scopeEnumeration"/>
- <entity-and entity-name="WorkEffortPartyAssignView" list-name="partyAssignments">
+ <entity-and entity-name="WorkEffortPartyAssignView" list="partyAssignments">
<field-map field-name="workEffortId"/>
</entity-and>
- <entity-and entity-name="WorkEffortAndFixedAssetAssign" list-name="fixedAssetAssignments" filter-by-date="true">
+ <entity-and entity-name="WorkEffortAndFixedAssetAssign" list="fixedAssetAssignments" filter-by-date="true">
<field-map field-name="workEffortId"/>
</entity-and>
- <entity-and entity-name="WorkEffortCommunicationEventView" list-name="commEvents">
+ <entity-and entity-name="WorkEffortCommunicationEventView" list="commEvents">
<field-map field-name="workEffortId"/>
</entity-and>
- <entity-and entity-name="WorkEffortShoppingListView" list-name="shoppingLists">
+ <entity-and entity-name="WorkEffortShoppingListView" list="shoppingLists">
<field-map field-name="workEffortId"/>
</entity-and>
- <entity-and entity-name="WorkEffortQuoteView" list-name="quotes">
+ <entity-and entity-name="WorkEffortQuoteView" list="quotes">
<field-map field-name="workEffortId"/>
</entity-and>
- <entity-and entity-name="WorkEffortOrderHeaderView" list-name="orderHeaders">
+ <entity-and entity-name="WorkEffortOrderHeaderView" list="orderHeaders">
<field-map field-name="workEffortId"/>
</entity-and>
</actions>
@@ -100,7 +100,7 @@
<label text="${uiLabelMap.WorkEffortCommEvents}"/>
</container>
<container style="screenlet-body">
- <iterate-section list-name="commEvents" entry-name="commEvent">
+ <iterate-section list="commEvents" entry="commEvent">
<section>
<widgets>
<container>
@@ -121,7 +121,7 @@
<label text="${uiLabelMap.WorkEffortShopLists}"/>
</container>
<container style="screenlet-body">
- <iterate-section list-name="shoppingLists" entry-name="shopList">
+ <iterate-section list="shoppingLists" entry="shopList">
<section>
<widgets>
<container>
@@ -142,7 +142,7 @@
<label text="${uiLabelMap.WorkEffortQuotes}"/>
</container>
<container style="screenlet-body">
- <iterate-section list-name="quotes" entry-name="quote">
+ <iterate-section list="quotes" entry="quote">
<section>
<widgets>
<container>
@@ -163,7 +163,7 @@
<label text="${uiLabelMap.WorkEffortOrderHeaders}"/>
</container>
<container style="screenlet-body">
- <iterate-section list-name="orderHeaders" entry-name="orderHeader">
+ <iterate-section list="orderHeaders" entry="orderHeader">
<section>
<widgets>
<container>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Sun Feb 1 15:13:37 2009
@@ -28,8 +28,8 @@
<set field="filterByStatusId" from-field="parameters.statusId" default-value="SERVICE_RUNNING"/>
<entity-condition entity-name="JobSandbox" list="userJobs">
<condition-list>
- <condition-expr field-name="authUserLoginId" env-name="userLogin.userLoginId"/>
- <condition-expr field-name="statusId" env-name="filterByStatusId"/>
+ <condition-expr field-name="authUserLoginId" from-field="userLogin.userLoginId"/>
+ <condition-expr field-name="statusId" from-field="filterByStatusId"/>
</condition-list>
</entity-condition>
</actions>
@@ -896,14 +896,14 @@
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
<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="workEffort" relation-name="ScopeEnumeration" to-value-name="scopeEnumeration"/>
- <entity-and entity-name="WorkEffortPartyAssignView" list-name="partyAssignments">
+ <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="workEffort" relation-name="ScopeEnumeration" to-value-field="scopeEnumeration"/>
+ <entity-and entity-name="WorkEffortPartyAssignView" list="partyAssignments">
<field-map field-name="workEffortId"/>
</entity-and>
- <entity-and entity-name="WorkEffortAndFixedAssetAssign" list-name="fixedAssetAssignments" filter-by-date="true">
+ <entity-and entity-name="WorkEffortAndFixedAssetAssign" list="fixedAssetAssignments" filter-by-date="true">
<field-map field-name="workEffortId"/>
</entity-and>
</actions>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml?rev=739776&r1=739775&r2=739776&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml Sun Feb 1 15:13:37 2009
@@ -27,7 +27,7 @@
<include-screen name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortScreens.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://workeffort/widget/WorkEffortScreens.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>