Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Sat Nov 5 12:41:35 2016 @@ -281,7 +281,7 @@ under the License. <entity-one entity-name="Requirement" value-field="requirement" auto-field-map="true"/> <entity-and entity-name="RequirementCustRequest" list="requirementCustRequests"> - <field-map from-field="requirementId" field-name="requirementId"/> + <field-map field-name="requirementId" from-field="requirementId"/> </entity-and> </actions> <widgets> @@ -307,7 +307,7 @@ under the License. <set field="requirementId" from-field="parameters.requirementId"/> <entity-one entity-name="Requirement" value-field="requirement" auto-field-map="true"/> <entity-and entity-name="OrderRequirementCommitment" list="orderRequirements"> - <field-map from-field="requirementId" field-name="requirementId"/> + <field-map field-name="requirementId" from-field="requirementId"/> </entity-and> </actions> <widgets> @@ -333,7 +333,7 @@ under the License. <set field="requirementId" from-field="parameters.requirementId"/> <entity-one entity-name="Requirement" value-field="requirement" auto-field-map="true"/> <entity-and entity-name="RequirementRole" list="requirementRoles"> - <field-map from-field="requirementId" field-name="requirementId"/> + <field-map field-name="requirementId" from-field="requirementId"/> </entity-and> </actions> <widgets>
Modified: ofbiz/trunk/applications/party/minilang/LookupServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/LookupServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/LookupServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/LookupServices.xml Sat Nov 5 12:41:35 2016 @@ -28,7 +28,7 @@ under the License. <set from-field="parameters.lastName" field="LookupMap.lastName"/> </if-not-empty> <find-by-and entity-name="Person" map="LookupMap" list="parties"/> - <iterate entry="party" list="parties"> + <iterate list="parties" entry="party"> <set from-field="party.firstName" field="resultEntry.label"/> <set from-field="party.partyId" field="resultEntry.value"/> <field-to-list field="resultEntry" list="lookupResult"/> Modified: ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml Sat Nov 5 12:41:35 2016 @@ -110,7 +110,7 @@ under the License. }"/> <!-- set role status from the parent commevent to completed --> - <entity-and list="roles" entity-name="CommunicationEventRole"> + <entity-and entity-name="CommunicationEventRole" list="roles"> <field-map field-name="communicationEventId" from-field="parentCommEvent.communicationEventId"/> <field-map field-name="partyId" from-field="newEntity.partyIdFrom"/> </entity-and> @@ -186,7 +186,7 @@ under the License. </condition-list> </entity-condition> <if-not-empty field="roles"> - <iterate entry="role" list="roles"> + <iterate list="roles" entry="role"> <set-service-fields service-name="createCommunicationEventRole" map="role" to-map="newRole"/> <set field="newRole.communicationEventId" from-field="newEntity.communicationEventId"/> <call-service service-name="createCommunicationEventRole" in-map-name="newRole"/> @@ -236,7 +236,7 @@ under the License. <entity-and entity-name="CommEventContentAssoc" list="commEventContentAssoc"> <field-map field-name="communicationEventId" from-field="parameters.origCommEventId"/> </entity-and> - <iterate entry="createcommEventContentAssoc" list="commEventContentAssoc"> + <iterate list="commEventContentAssoc" entry="createcommEventContentAssoc"> <if-not-empty field="createcommEventContentAssoc"> <!-- Create communication event and content association --> <set field="contentAssoc.contentId" from-field="createcommEventContentAssoc.contentId"/> @@ -250,7 +250,7 @@ under the License. <simple-method method-name="updateCommunicationEvent" short-description="Update a CommunicationEvent"> <entity-one entity-name="CommunicationEvent" value-field="event"/> - <if-compare-field to-field="parameters.statusId" operator="not-equals" field="event.statusId"> + <if-compare-field field="event.statusId" operator="not-equals" to-field="parameters.statusId">> <set field="newStatusId" from-field="parameters.statusId"/> <set field="parameters.statusId" from-field="event.statusId"/> </if-compare-field> @@ -349,23 +349,23 @@ under the License. <!-- remove related links to content --> <get-related value-field="event" relation-name="CommEventContentAssoc" list="contentAssocs"/> <if-not-empty field="contentAssocs"> - <iterate entry="contentAssoc" list="contentAssocs"> + <iterate list="contentAssocs" entry="contentAssoc"> <remove-value value-field="contentAssoc"/> <!-- delete content and dataresource too if requested --> <if-compare field="parameters.delContentDataResource" value="Y" operator="equals"> <get-related value-field="contentAssoc" relation-name="FromContent" list="contents"/> <if-not-empty field="contents"> - <iterate entry="content" list="contents"> + <iterate list="contents" entry="content"> <remove-related value-field="content" relation-name="ContentRole"/> <remove-related value-field="content" relation-name="ContentKeyword"/> <get-related value-field="content" relation-name="FromContentAssoc" list="relatedFromContentassocs"/> - <iterate entry="relatedFromContentassoc" list="relatedFromContentassocs"> + <iterate list="relatedFromContentassocs" entry="relatedFromContentassoc"> <set field="removeContentAndRelatedInmap.contentId" from-field="relatedFromContentassoc.contentIdTo"/> <call-service service-name="removeContentAndRelated" in-map-name="removeContentAndRelatedInmap"/> </iterate> <remove-related value-field="content" relation-name="FromContentAssoc"/> <get-related value-field="content" relation-name="ToContentAssoc" list="relatedToContentassocs"/> - <iterate entry="relatedToContentassoc" list="relatedToContentassocs"> + <iterate list="relatedToContentassocs" entry="relatedToContentassoc"> <set field="removeContentAndRelatedInmap.contentId" from-field="relatedFromContentassoc.contentIdFrom"/> <call-service service-name="removeContentAndRelated" in-map-name="removeContentAndRelatedInmap"/> </iterate> @@ -395,7 +395,7 @@ under the License. <!-- remove related workeffort when this is the only communicationevent connected to it --> <get-related value-field="event" relation-name="CommunicationEventWorkEff" list="workEffortComs"/> <if-not-empty field="workEffortComs"> - <iterate entry="workEffortCom" list="workEffortComs"> + <iterate list="workEffortComs" entry="workEffortCom"> <remove-value value-field="workEffortCom"/> <get-related-one value-field="workEffortCom" relation-name="WorkEffort" to-value-field="workEffort"/> <get-related value-field="workEffort" relation-name="CommunicationEventWorkEff" list="otherComs"/> @@ -462,7 +462,7 @@ under the License. <if-not-empty field="eventRole"> <remove-value value-field="eventRole"/> <if-compare field="parameters.deleteCommEventIfLast" operator="equals" value="Y"> - <entity-and list="roles" entity-name="CommunicationEventRole"> + <entity-and entity-name="CommunicationEventRole" list="roles"> <field-map field-name="communicationEventId" from-field="eventRole.communicationEventId"/> </entity-and> <if-empty field="roles"> @@ -490,7 +490,7 @@ under the License. </condition-list> </condition-list> </entity-condition> - <iterate entry="communicationEvent" list="communicationEvents"> + <iterate list="communicationEvents" entry="communicationEvent"> <set-service-fields service-name="sendCommEventAsEmail" map="communicationEvent" to-map="inMap"/> <call-service service-name="sendCommEventAsEmail" in-map-name="inMap" require-new-transaction="true" break-on-error="false"/> </iterate> @@ -506,13 +506,13 @@ under the License. </condition-list> </condition-list> </entity-condition> - <iterate entry="communicationEvent" list="communicationEvents"> + <iterate list="communicationEvents" entry="communicationEvent"> <entity-and entity-name="ContactListParty" list="contactListParties"> <field-map field-name="contactListId" from-field="communicationEvent.contactListId"/> </entity-and> <set field="communicationEventRole.communicationEventId" from-field="communicationEvent.communicationEventId"/> <set field="communicationEventRole.roleTypeId" value="ADDRESSEE"/> - <iterate entry="contactListParty" list="contactListParties"> + <iterate list="contactListParties" entry="contactListParty"> <set field="communicationEventRole.partyId" from-field="contactListParty.partyId"/> <call-service service-name="createCommunicationEventRole" in-map-name="communicationEventRole"/> </iterate> @@ -545,7 +545,7 @@ under the License. which means the commevent was dealt with and no further action is required by any of the other participants/addressees --> <get-related relation-name="CommunicationEventRole" list="roles" value-field="communicationEvent"/> <iterate entry="role" list="roles"> - <if-compare-field operator="not-equals" field="role.statusId" to-field="COM_ROLE_COMPLETED"> + <if-compare-field field="role.statusId" operator="not-equals" to-field="COM_ROLE_COMPLETED"> <set field="role.statusId" value="COM_ROLE_COMPLETED"/> <store-value value-field="role"/> </if-compare-field> Modified: ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml Sat Nov 5 12:41:35 2016 @@ -235,7 +235,7 @@ under the License. <find-by-primary-key value-field="emailAddressVerification" entity-name="EmailAddressVerification" map="lookupHash"/> <set field="bodyParameters.verifyHash" from-field="emailAddressVerification.verifyHash"/> <first-from-list entry="storeEmail" list="productStoreEmailSettings"/> - <entity-and list="webSites" entity-name="WebSite"> + <entity-and entity-name="WebSite" list="webSites"> <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/> </entity-and> <first-from-list entry="webSite" list="webSites"/> Modified: ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml Sat Nov 5 12:41:35 2016 @@ -27,10 +27,10 @@ under the License. </if-empty> <!-- check if the contact mech infostring is already existing if so, do not create a new one--> - <entity-and list="partyAndContactMechs" entity-name="PartyAndContactMech" filter-by-date="true"> + <entity-and entity-name="PartyAndContactMech" list="partyAndContactMechs" filter-by-date="true"> <field-map field-name="partyId" from-field="parameters.partyId"/> </entity-and> - <iterate entry="partyAndContactMech" list="partyAndContactMechs"> + <iterate list="partyAndContactMechs" entry="partyAndContactMech"> <entity-one entity-name="ContactMechType" value-field="contactMechType"> <field-map field-name="contactMechTypeId" from-field="partyAndContactMech.contactMechTypeId"/> </entity-one> @@ -102,14 +102,14 @@ under the License. </if-empty> <if-compare-field to-field="newPartyContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals"> - <set-nonpk-fields value-field="newPartyContactMech" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="newPartyContactMech"/> <now-timestamp field="newPartyContactMech.fromDate"/> <now-timestamp field="partyContactMech.thruDate"/> <store-value value-field="partyContactMech"/> <create-value value-field="newPartyContactMech"/> <get-related value-field="partyContactMech" relation-name="PartyContactMechPurpose" list="partyContactMechPurposes"/> <filter-list-by-date list="partyContactMechPurposes"/> - <iterate entry="partyContactMechPurposeOld" list="partyContactMechPurposes"> + <iterate list="partyContactMechPurposes" entry="partyContactMechPurposeOld"> <clone-value value-field="partyContactMechPurposeOld" new-value-field="partyContactMechPurpose"/> <now-timestamp field="partyContactMechPurposeOld.thruDate"/> <store-value value-field="partyContactMechPurposeOld"/> @@ -129,7 +129,7 @@ under the License. <field-to-request field="newPartyContactMech.contactMechId" request-name="contactMechId"/> <else> <set field="extension" from-field="partyContactMech.extension"/> - <set-nonpk-fields value-field="partyContactMech" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="partyContactMech"/> <if-compare-field field="parameters.extension" operator="not-equals" to-field="extension"> <set field="partyContactMech.thruDate" value=""/> </if-compare-field> @@ -359,7 +359,7 @@ under the License. <set field="dash" value="-"/> <set field="emptyString" value=""/> <set field="inputTelno" value="${str:replaceAll(parameters.telno, dash, emptyString)}"/> - <iterate entry="contactMech" list="contactMechs"> + <iterate list="contactMechs" entry="contactMech"> <set field="telno" value="${str:replace(contactMech.tnContactNumber, dash, emptyString)}"/> <if-compare-field field="inputTelno" operator="equals" to-field="telno"> <set field="partyId" from-field="contactMech.partyId"/> @@ -392,7 +392,7 @@ under the License. <set field="dash" value="-"/> <set field="emptyString" value=""/> <set field="inputTelno" from-field="parameters.telno"/> - <iterate entry="contactMech" list="contactMechs"> + <iterate list="contactMechs" entry="contactMech"> <set field="telno" from-field="contactMech.tnContactNumber"/> <!--set field="telno" value="${str:replace(contactMech.tnContactNumber, dash, emptyString)}"/--> <if-compare-field field="inputTelno" operator="equals" to-field="telno"> Modified: ofbiz/trunk/applications/party/minilang/party/PartyPermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartyPermissionServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/party/PartyPermissionServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/party/PartyPermissionServices.xml Sat Nov 5 12:41:35 2016 @@ -146,7 +146,7 @@ under the License. <if-empty field="partyInvitation.partyId"> <if-empty field="partyInvitation.emailAddress"> <add-error> - <fail-property property="PartyInvitationNotValidError" resource="PartyUiLabels"/> + <fail-property resource="PartyUiLabels" property="PartyInvitationNotValidError"/> </add-error> <else> <set field="findPartyCtx.address" from-field="partyInvitation.emailAddress"/> @@ -160,7 +160,7 @@ under the License. </if-compare-field> <else> <add-error> - <fail-property property="PartyInvitationNotValidError" resource="PartyUiLabels"/> + <fail-property resource="PartyUiLabels" property="PartyInvitationNotValidError"/> </add-error> </else> </if-not-empty> @@ -199,7 +199,7 @@ under the License. <if-empty field="partyInvitation.partyId"> <if-empty field="partyInvitation.emailAddress"> <add-error> - <fail-property property="PartyInvitationNotValidError" resource="PartyUiLabels"/> + <fail-property resource="PartyUiLabels" property="PartyInvitationNotValidError"/> </add-error> <else> <set field="findPartyCtx.address" from-field="partyInvitation.emailAddress"/> @@ -213,7 +213,7 @@ under the License. </if-compare-field> <else> <add-error> - <fail-property property="PartyInvitationNotValidError" resource="PartyUiLabels"/> + <fail-property resource="PartyUiLabels" property="PartyInvitationNotValidError"/> </add-error> </else> </if-not-empty> Modified: ofbiz/trunk/applications/party/minilang/party/PartyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartyServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/party/PartyServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/party/PartyServices.xml Sat Nov 5 12:41:35 2016 @@ -38,7 +38,7 @@ under the License. <if> <condition><if-compare-field field="partyGroup.groupName" to-field="parameters.groupName" operator="not-equals"/></condition> <then> - <set-nonpk-fields value-field="partyNameHistory" map="partyGroup"/> + <set-nonpk-fields map="partyGroup" value-field="partyNameHistory"/> <create-value value-field="partyNameHistory"/> </then> </if> @@ -66,7 +66,7 @@ under the License. </or> </condition> <then> - <set-nonpk-fields value-field="partyNameHistory" map="person"/> + <set-nonpk-fields map="person" value-field="partyNameHistory"/> <create-value value-field="partyNameHistory"/> </then> </if> @@ -87,7 +87,7 @@ under the License. <set field="parameters.compareDate" from-field="nowTimestamp"/> </if-empty> <!-- go through the list which is sorted by most recent first and find the oldest (last) one with the changeDate greater than the compareDate --> - <iterate entry="partyNameHistory" list="partyNameHistoryList"> + <iterate list="partyNameHistoryList" entry="partyNameHistory"> <if-compare-field field="partyNameHistory.changeDate" to-field="parameters.compareDate" operator="greater" type="Timestamp"> <set field="partyNameHistoryCurrent" from-field="partyNameHistory"/> </if-compare-field> @@ -209,7 +209,7 @@ under the License. </if-empty> <!-- update the fields --> - <set-nonpk-fields value-field="partyProfileDefault" map="parameters" set-if-null="false"/> + <set-nonpk-fields map="parameters" value-field="partyProfileDefault"/> set-if-null="false"/> <store-value value-field="partyProfileDefault"/> </simple-method> @@ -467,7 +467,7 @@ under the License. <simple-method method-name="followPartyRelationshipsInlineRecurse" short-description="followPartyRelationshipsInlineRecurse"> <clear-field field="_inline_NewRelatedPartyIdList"/> - <iterate entry="relatedPartyId" list="relatedPartyIdList"> + <iterate list="relatedPartyIdList" entry="relatedPartyId"> <if> <condition><not><if-compare-field field="_inline_relatedPartyIdAlreadySearchedList" to-field="relatedPartyId" operator="contains"/></not></condition> <then> @@ -491,7 +491,7 @@ under the License. <!-- get the newest (highest date) first --> <order-by field-name="-fromDate"/> </entity-condition> - <iterate entry="_inline_PartyRelationship" list="_inline_PartyRelationshipList"> + <iterate list="_inline_PartyRelationshipList" entry="_inline_PartyRelationship"> <if> <condition> <and> @@ -524,7 +524,7 @@ under the License. <!-- get the newest (highest date) first --> <order-by field-name="-fromDate"/> </entity-condition> - <iterate entry="_inline_PartyRelationship" list="_inline_PartyRelationshipList"> + <iterate list="_inline_PartyRelationshipList" entry="_inline_PartyRelationship"> <if> <condition> <and> @@ -561,7 +561,7 @@ under the License. <simple-method method-name="getChildRoleTypesInline" short-description="getChildRoleTypes"> <clear-field field="_inline_NewRoleTypeIdList"/> - <iterate entry="roleTypeId" list="${roleTypeIdListName}"> + <iterate list="${roleTypeIdListName}" entry="roleTypeId"> <if> <condition><not><if-compare-field field="_inline_roleTypeIdAlreadySearchedList" to-field="roleTypeId" operator="contains"/></not></condition> <then> @@ -571,7 +571,7 @@ under the License. <entity-condition entity-name="RoleType" list="_inline_RoleTypeList" use-cache="true"> <condition-expr field-name="parentTypeId" operator="equals" from-field="roleTypeId"/> </entity-condition> - <iterate entry="newRoleType" list="_inline_RoleTypeList"> + <iterate list="_inline_RoleTypeList" entry="newRoleType"> <if> <condition> <and> @@ -647,8 +647,8 @@ under the License. <filter-list-by-date list="telephoneAll1" to-list="telephoneAll2" from-field-name="purposeFromDate" thru-field-name="purposeThruDate"/> <filter-list-by-date list="telephoneAll2" to-list="telephoneAll3"/> <if-not-empty field="telephoneAll3"> - <iterate entry="type" list="types"> - <iterate entry="telephone" list="telephoneAll3"> + <iterate list="types" entry="type"> + <iterate list="telephoneAll3" entry="telephone"> <if-empty field="found"> <if-compare-field field="telephone.contactMechPurposeTypeId" to-field="type" operator="equals"> <set field="found" value="notImportant"/> @@ -708,8 +708,8 @@ under the License. <filter-list-by-date list="addressAll1" to-list="addressAll2" from-field-name="purposeFromDate" thru-field-name="purposeThruDate"/> <filter-list-by-date list="addressAll2" to-list="addressAll3"/> <if-not-empty field="addressAll3"> - <iterate entry="type" list="types"> - <iterate entry="address" list="addressAll3"> + <iterate list="types" entry="type"> + <iterate list="addressAll3" entry="address"> <if-empty field="found"> <if-compare-field field="address.contactMechPurposeTypeId" to-field="type" operator="equals"> <set field="found" value="notImportant"/> @@ -789,7 +789,7 @@ under the License. <entity-condition entity-name="AddressMatchMap" list="addrs"> <use-iterator/> </entity-condition> - <iterate entry="addr" list="addrs"> + <iterate list="addrs" entry="addr"> <remove-value value-field="addr"/> </iterate> </simple-method> @@ -873,7 +873,7 @@ under the License. <field-map field-name="emailType"/> <field-map field-name="productStoreId"/> </entity-one> - <entity-and list="webSites" entity-name="WebSite"> + <entity-and entity-name="WebSite" list="webSites"> <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/> </entity-and> <first-from-list entry="webSite" list="webSites"/> @@ -906,7 +906,7 @@ under the License. <field-map field-name="emailType" value="UPD_PRSNL_INF_CNFRM"/> <field-map field-name="productStoreId"/> </entity-one> - <entity-and list="webSites" entity-name="WebSite"> + <entity-and entity-name="WebSite" list="webSites"> <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/> </entity-and> <first-from-list entry="webSite" list="webSites"/> @@ -1011,7 +1011,7 @@ under the License. </entity-and> <!-- find the role in the list --> <clear-field field="mainRoleTypeId"/> - <iterate entry="partyRole" list="partyRoles"> + <iterate list="partyRoles" entry="partyRole"> <if-empty field="mainRoleTypeId"> <entity-and entity-name="RoleTypeIn3Levels" list="roleTypeIn3Levels"> <field-map field-name="topRoleTypeId" value="MAIN_ROLE" /> @@ -1027,7 +1027,7 @@ under the License. <entity-one entity-name="RoleType" value-field="roleType"> <field-map field-name="roleTypeId" from-field="mainRoleTypeId" /> </entity-one> - <field-to-result result-name="description" field="roleType.description" /> + <field-to-result field="roleType.description" result-name="description" /> </if-not-empty> </simple-method> @@ -1040,7 +1040,7 @@ under the License. <field-map field-name="emailType"/> <field-map field-name="productStoreId"/> </entity-one> - <entity-and list="webSites" entity-name="WebSite"> + <entity-and entity-name="WebSite" list="webSites"> <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/> </entity-and> <first-from-list entry="webSite" list="webSites"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sat Nov 5 12:41:35 2016 @@ -120,7 +120,7 @@ under the License. <parameter param-name="partyId"/> </link> </container> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListPendingCommEvents"/> + <include-form name="ListPendingCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> @@ -152,7 +152,7 @@ under the License. <condition-expr field-name="partyId" operator="equals" value="${partyId}"/> <order-by field-name="-entryDate"/> </entity-condition> - <entity-and list="contacts" entity-name="PartyRelationship" filter-by-date="true"> + <entity-and entity-name="PartyRelationship" list="contacts" filter-by-date="true"> <field-map field-name="partyIdFrom" from-field="partyId"/> <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/> <field-map field-name="roleTypeIdTo" value="CONTACT"/> @@ -168,7 +168,7 @@ under the License. </condition> <widgets> <container style="h1"><label text="${uiLabelMap.PageTitleListCommunications} ${partyId}"/></container> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommEvents"/> + <include-form name="ListCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> <section> <condition> <not><if-empty field="contacts"/></not> @@ -189,7 +189,7 @@ under the License. </actions> <widgets> <container style="h2"><label text="${contact.partyIdTo}"/></container> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommEvents"/> + <include-form name="ListCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </widgets> </section> </iterate-section> @@ -214,7 +214,7 @@ under the License. <condition-expr field-name="partyId" operator="equals" from-field="partyIdFrom"/> <order-by field-name="-entryDate"/> </entity-condition> - <entity-and list="contacts" entity-name="PartyRelationship" filter-by-date="true"> + <entity-and entity-name="PartyRelationship" list="contacts" filter-by-date="true"> <field-map field-name="partyIdFrom" from-field="partyIdFrom"/> <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/> <field-map field-name="roleTypeIdTo" value="CONTACT"/> @@ -236,7 +236,7 @@ under the License. <iterate-section entry="account" list="accounts"> <section> <widgets> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommEvents"/> + <include-form name="ListCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </widgets> </section> </iterate-section> @@ -258,7 +258,7 @@ under the License. </condition> <widgets> <container style="h2"><label text="${contact.partyIdTo}"/></container> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommEvents"/> + <include-form name="ListCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </widgets> </section> </widgets> @@ -294,7 +294,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleListUnknownPartyComms}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListUnknownPartyEmails"/> + <include-form name="ListUnknownPartyEmails" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -323,10 +323,10 @@ under the License. <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="FindCommunicationByOrder"/> + <include-form name="FindCommunicationByOrder" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommunicationByOrder"/> + <include-form name="ListCommunicationByOrder" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -358,10 +358,10 @@ under the License. <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="FindCommEvents"/> + <include-form name="FindCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListLookupCommEvents"/> + <include-form name="ListLookupCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -430,7 +430,7 @@ under the License. </screenlet> <section> <actions> - <entity-and list="commEvents" entity-name="CommunicationEvent"> + <entity-and entity-name="CommunicationEvent" list="commEvents"> <field-map field-name="parentCommEventId" from-field="parameters.communicationEventId"/> </entity-and> </actions> @@ -530,7 +530,7 @@ under the License. <decorator-screen name="Common${my}CommunicationEventDecorator" location="${parameters.communicationEventDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyEditCustomerRequest}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditRequestFromCommEvent"/> + <include-form name="EditRequestFromCommEvent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -558,10 +558,10 @@ under the License. <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.communicationEventDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyCommEventRoles}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommRoles"/> + <include-form name="ListCommRoles" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyCommEventRoles}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="AddEventRole"/> + <include-form name="AddEventRole" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -588,8 +588,8 @@ under the License. <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.communicationEventDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyCommEventPurposes}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="AddEventPurpose"/> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommPurposes"/> + <include-form name="AddEventPurpose" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> + <include-form name="ListCommPurposes" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -618,7 +618,7 @@ under the License. <parameter param-name="partyId"/> </link> </container> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommWorkEfforts"/> + <include-form name="ListCommWorkEfforts" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -641,7 +641,7 @@ under the License. <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.communicationEventDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyCommWorkEfforts}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="AddCommEventWorkEffort"/> + <include-form name="AddCommEventWorkEffort" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -661,7 +661,7 @@ under the License. <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.communicationEventDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyCommWorkEfforts}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="AddCommEventWorkEffort"/> + <include-form name="AddCommEventWorkEffort" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -690,10 +690,10 @@ under the License. <widgets> <container> <screenlet title="${uiLabelMap.PartyCommContent}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommContent"/> + <include-form name="ListCommContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyAttachContent}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="UploadContent1"/> + <include-form name="UploadContent1" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </container> </widgets> @@ -728,7 +728,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PartyNewCommContent}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="AddCommContent"/> + <include-form name="AddCommContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -773,7 +773,7 @@ under the License. </widgets> </section> <container style="h1"><label text="${uiLabelMap.PageTitleEditCommContent}"/></container> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditCommContent"/> + <include-form name="EditCommContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> <section> <condition> <if-regexp expr="text.*" field="commEventContentDataResource.drMimeTypeId"/> @@ -785,7 +785,7 @@ under the License. </actions> <widgets> <screenlet title="${uiLabelMap.PageTitleEditCommContent}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditCommTextContent"/> + <include-form name="EditCommTextContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </widgets> </section> @@ -797,7 +797,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PartyViewImage}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="UploadCommContent"/> + <include-form name="UploadCommContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> <label text="${uiLabelMap.PartyViewImage}" style="h1"/> <content dataresource-id="${commEventContentDataResource.drDataResourceId}"/> </screenlet> @@ -1096,12 +1096,12 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PartyCreateAddEmail} ${uiLabelMap.CommonFrom} ${parameters.partyIdFrom}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditEmail"/> + <include-form name="EditEmail" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.CommonFrom}: ${communicationEvent.partyIdFrom}, CommunicationEventId: ${communicationEvent.communicationEventId}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditEmail"/> + <include-form name="EditEmail" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> <container style="lefthalf"> <screenlet title="${uiLabelMap.PartyCommEventRoles}"> @@ -1134,13 +1134,13 @@ under the License. </condition> <widgets> <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent} ${parameters.communicationEventId}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditInternalNote"/> + <include-form name="EditInternalNote" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </widgets> <fail-widgets> <container style="lefthalf"> <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent} ${parameters.communicationEventId} ${uiLabelMap.CommonFrom} ${communicationEvent.partyIdFrom}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditInternalNote"/> + <include-form name="EditInternalNote" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </container> <container style="righthalf"> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml Sat Nov 5 12:41:35 2016 @@ -39,9 +39,9 @@ under the License. </condition> <widgets> <screenlet id="AddPartyContactListPanel" title="${uiLabelMap.PartyContactListPartyCreate}" collapsible="true"> - <include-form location="component://party/widget/partymgr/PartyContactListForms.xml" name="AddPartyContactList"/> + <include-form name="AddPartyContactList" location="component://party/widget/partymgr/PartyContactListForms.xml"/> </screenlet> - <include-form location="component://party/widget/partymgr/PartyContactListForms.xml" name="ListPartyContactLists"/> + <include-form name="ListPartyContactLists" location="component://party/widget/partymgr/PartyContactListForms.xml"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> @@ -68,7 +68,7 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-results"> - <include-form location="component://party/widget/partymgr/PartyContactListForms.xml" name="ListLookupContactList"/> + <include-form name="ListLookupContactList" location="component://party/widget/partymgr/PartyContactListForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Sat Nov 5 12:41:35 2016 @@ -35,7 +35,7 @@ <entity-one entity-name="PartyAndPerson" value-field="lookupPerson"> <field-map field-name="partyId" from-field="parameters.partyId"/><!-- is required --> </entity-one> - <entity-and list="partyContentList" entity-name="PartyContent" filter-by-date="true"> + <entity-and entity-name="PartyContent" list="partyContentList" filter-by-date="true"> <field-map field-name="partyId" from-field="parameters.partyId"/> <field-map field-name="partyContentTypeId" value="LGOIMGURL"/> <order-by field-name="-fromDate"/> @@ -511,7 +511,7 @@ <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <entity-one entity-name="Party" value-field="party"></entity-one> - <entity-and list="contacts" entity-name="PartyRelationship" filter-by-date="true"> + <entity-and entity-name="PartyRelationship" list="contacts" filter-by-date="true"> <field-map field-name="partyIdFrom" from-field="parameters.partyId"/> <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/> <field-map field-name="roleTypeIdTo" value="CONTACT"/> @@ -546,7 +546,7 @@ <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <entity-and list="accounts" entity-name="PartyRelationship" filter-by-date="true"> + <entity-and entity-name="PartyRelationship" list="accounts" filter-by-date="true"> <field-map field-name="partyIdTo" from-field="parameters.partyId"/> <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/> <field-map field-name="roleTypeIdTo" value="CONTACT"/> Modified: ofbiz/trunk/applications/product/minilang/product/catalog/CatalogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/catalog/CatalogServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/catalog/CatalogServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/catalog/CatalogServices.xml Sat Nov 5 12:41:35 2016 @@ -69,7 +69,7 @@ under the License. <call-object-method obj-field="categories" method-name="contains" ret-field="addInCategories" > <field field="relCategory" type="java.lang.Object"/> </call-object-method> - <if-compare value="false" field="addInCategories" operator="equals" type="Boolean"> + <if-compare field="addInCategories" operator="equals" value="false" type="Boolean"> <field-to-list list="categories" field="relCategory"/> </if-compare> </iterate> @@ -95,7 +95,7 @@ under the License. <!-- iterate entry-name="category" list-name="categories"> <log level="info" message="Category ${category.productCategoryId}"/> </iterate --> - <field-to-result result-name="categories" field="categories"/> + <field-to-result field="categories" result-name="categories"/> </simple-method> <simple-method method-name="checkImageUrlForAllCategories" short-description="Check for image url exists or not for All categories" login-required="false"> @@ -135,7 +135,7 @@ under the License. </call-service> <if-not-empty field="filesImageMap.categoryImageUrlMap.categoryImageUrl"> - <if-compare value="Y" field="filesImageMap.categoryImageUrlMap.isExists" operator="equals"> + <if-compare field="filesImageMap.categoryImageUrlMap.isExists" operator="equals" value="Y"> <field-to-list field="" list=""/> <field-to-list list="fileExists" field="filesImageMap.categoryImageUrlMap.categoryImageUrl"/> <else> @@ -144,7 +144,7 @@ under the License. </if-compare> </if-not-empty> <if-not-empty field="filesImageMap.linkOneImageUrlMap.linkOneImageUrl"> - <if-compare value="Y" field="filesImageMap.linkOneImageUrlMap.isExists" operator="equals"> + <if-compare field="filesImageMap.linkOneImageUrlMap.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.linkOneImageUrlMap.linkOneImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.linkOneImageUrlMap.linkOneImageUrl"/> @@ -152,7 +152,7 @@ under the License. </if-compare> </if-not-empty> <if-not-empty field="filesImageMap.linkTwoImageUrlMap.linkTwoImageUrl"> - <if-compare value="Y" field="filesImageMap.linkTwoImageUrlMap.isExists" operator="equals"> + <if-compare field="filesImageMap.linkTwoImageUrlMap.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.linkTwoImageUrlMap.linkTwoImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.linkTwoImageUrlMap.linkTwoImageUrl"/> @@ -169,7 +169,7 @@ under the License. </call-service> <if-not-empty field="filesImageMap"> <if-not-empty field="filesImageMap.smallImageUrlMap.smallImageUrl"> - <if-compare value="Y" field="filesImageMap.smallImageUrlMap.isExists" operator="equals"> + <if-compare field="filesImageMap.smallImageUrlMap.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.smallImageUrlMap.smallImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.smallImageUrlMap.smallImageUrl"/> @@ -177,7 +177,7 @@ under the License. </if-compare> </if-not-empty> <if-not-empty field="filesImageMap.mediumImageUrlMap.mediumImageUrl"> - <if-compare value="Y" field="filesImageMap.mediumImageUrlMap.isExists" operator="equals"> + <if-compare field="filesImageMap.mediumImageUrlMap.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.mediumImageUrlMap.mediumImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.mediumImageUrlMap.mediumImageUrl"/> @@ -185,7 +185,7 @@ under the License. </if-compare> </if-not-empty> <if-not-empty field="filesImageMap.largeImageUrlMap.largeImageUrl"> - <if-compare value="Y" field="filesImageMap.largeImageUrlMap.isExists" operator="equals"> + <if-compare field="filesImageMap.largeImageUrlMap.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.largeImageUrlMap.largeImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.largeImageUrlMap.largeImageUrl"/> @@ -193,7 +193,7 @@ under the License. </if-compare> </if-not-empty> <if-not-empty field="filesImageMap.detailImageUrlMap.detailImageUrl"> - <if-compare value="Y" field="filesImageMap.detailImageUrl.isExists" operator="equals"> + <if-compare field="filesImageMap.detailImageUrl.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.detailImageUrl.detailImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.detailImageUrl.detailImageUrl"/> @@ -204,14 +204,14 @@ under the License. <!-- Case For virtual Product --> <!-- get related assoc product --> <get-related-one relation-name="Product" value-field="productCategoryMember" to-value-field="product"/> - <if-compare operator="equals" field="product.isVirtual" value="Y"> + <if-compare field="product.isVirtual" operator="equals" value="Y"> <!-- log level="info" message = "Virtual product =====${productCategoryMember.productId}"/ --> <set field="virtualProductContext.productId" from-field="product.productId"/> <set field="virtualProductContext.productAssocTypeId" value="PRODUCT_VARIANT"/> <find-by-and entity-name="ProductAssoc" map="virtualProductContext" list="variantProducts"/> <filter-list-by-date list="variantProducts"/> <if-not-empty field="variantProducts"> - <iterate entry="variantProduct" list="variantProducts"> + <iterate list="variantProducts" entry="variantProduct"> <!-- log level="info" message = "Variant product =====${variantProduct.productIdTo}"/ --> <set field="variantProductContext.productId" from-field="variantProduct.productIdTo"/> <call-service service-name="checkImageUrlForProduct" in-map-name="variantProductContext"> @@ -219,7 +219,7 @@ under the License. </call-service> <if-not-empty field="filesImageMap"> <if-not-empty field="filesImageMap.smallImageUrlMap.smallImageUrl"> - <if-compare value="Y" field="filesImageMap.smallImageUrlMap.isExists" operator="equals"> + <if-compare field="filesImageMap.smallImageUrlMap.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.smallImageUrlMap.smallImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.smallImageUrlMap.smallImageUrl"/> @@ -228,7 +228,7 @@ under the License. </if-not-empty> <if-not-empty field="filesImageMap.mediumImageUrlMap.mediumImageUrl"> - <if-compare value="Y" field="filesImageMap.mediumImageUrlMap.isExists" operator="equals"> + <if-compare field="filesImageMap.mediumImageUrlMap.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.mediumImageUrlMap.mediumImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.mediumImageUrlMap.mediumImageUrl"/> @@ -237,7 +237,7 @@ under the License. </if-not-empty> <if-not-empty field="filesImageMap.largeImageUrlMap.largeImageUrl"> - <if-compare value="Y" field="filesImageMap.largeImageUrlMap.isExists" operator="equals"> + <if-compare field="filesImageMap.largeImageUrlMap.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.largeImageUrlMap.largeImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.largeImageUrlMap.largeImageUrl"/> @@ -246,7 +246,7 @@ under the License. </if-not-empty> <if-not-empty field="filesImageMap.detailImageUrlMap.detailImageUrl"> - <if-compare value="Y" field="filesImageMap.detailImageUrl.isExists" operator="equals"> + <if-compare field="filesImageMap.detailImageUrl.isExists" operator="equals" value="Y"> <field-to-list list="fileExists" field="filesImageMap.detailImageUrl.detailImageUrl"/> <else> <field-to-list list="fileNotExists" field="filesImageMap.detailImageUrl.detailImageUrl"/> @@ -279,7 +279,7 @@ under the License. <set field="categoryImageUrlMap.categoryImageUrl" from-field="category.categoryImageUrl"/> <set field="categoryImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.categoryImageUrlMap" from-field="categoryImageUrlMap"/> - <if-compare value="N" field="isExists" operator="equals"> + <if-compare field="isExists" operator="equals" value="N"> <clear-field field="category.categoryImageUrl"></clear-field> </if-compare> </if-not-empty> @@ -293,7 +293,7 @@ under the License. <set field="linkOneImageUrlMap.linkOneImageUrl" from-field="category.linkOneImageUrl"/> <set field="linkOneImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.linkOneImageUrlMap" from-field="linkOneImageUrlMap"/> - <if-compare value="N" field="isExists" operator="equals"> + <if-compare field="isExists" operator="equals" value="N"> <clear-field field="category.linkOneImageUrl"></clear-field> </if-compare> </if-not-empty> @@ -307,7 +307,7 @@ under the License. <set field="linkTwoImageUrlMap.largeImageUrl" from-field="category.linkTwoImageUrl"/> <set field="linkTwoImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.linkTwoImageUrlMap" from-field="linkTwoImageUrlMap"/> - <if-compare value="N" field="isExists" operator="equals"> + <if-compare field="isExists" operator="equals" value="N"> <clear-field field="category.linkTwoImageUrl"></clear-field> </if-compare> </if-not-empty> @@ -331,7 +331,7 @@ under the License. <set field="smallImageUrlMap.smallImageUrl" from-field="product.smallImageUrl"/> <set field="smallImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.smallImageUrlMap" from-field="smallImageUrlMap"/> - <if-compare value="N" field="isExists" operator="equals"> + <if-compare field="isExists" operator="equals" value="N"> <log level="info" message="Update SmallImage for product Id ${parameters.productId}"/> <clear-field field="product.smallImageUrl"></clear-field> </if-compare> @@ -346,7 +346,7 @@ under the License. <set field="mediumImageUrlMap.mediumImageUrl" from-field="product.mediumImageUrl"/> <set field="mediumImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.mediumImageUrlMap" from-field="mediumImageUrlMap"/> - <if-compare value="N" field="isExists" operator="equals"> + <if-compare field="isExists" operator="equals" value="N"> <clear-field field="product.mediumImageUrl"></clear-field> </if-compare> </if-not-empty> @@ -360,7 +360,7 @@ under the License. <set field="largeImageUrlMap.largeImageUrl" from-field="product.largeImageUrl"/> <set field="largeImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.largeImageUrlMap" from-field="largeImageUrlMap"/> - <if-compare value="N" field="isExists" operator="equals"> + <if-compare field="isExists" operator="equals" value="N"> <clear-field field="product.largeImageUrl"></clear-field> </if-compare> </if-not-empty> @@ -374,7 +374,7 @@ under the License. <set field="detailImageUrlMap.detailImageUrl" from-field="product.detailImageUrl"/> <set field="detailImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.detailImageUrlMap" from-field="detailImageUrlMap"/> - <if-compare value="N" field="isExists" operator="equals"> + <if-compare field="isExists" operator="equals" value="N"> <clear-field field="product.detailImageUrl"></clear-field> </if-compare> </if-not-empty> @@ -401,9 +401,9 @@ under the License. <if> <condition> <or> - <if-compare value="true" field="httpFlag" operator="equals" type="Boolean"/> - <if-compare value="true" field="httpsFlag" operator="equals" type="Boolean"/> - <if-compare value="true" field="ftpFlag" operator="equals" type="Boolean"/> + <if-compare field="httpFlag" operator="equals" value="true" type="Boolean"/> + <if-compare field="httpsFlag" operator="equals" value="true" type="Boolean"/> + <if-compare field="ftpFlag" operator="equals" value="true" type="Boolean"/> </or> </condition> <then> @@ -424,7 +424,7 @@ under the License. <set field="isExists" value="N"/> </else> </if-not-empty> - <field-to-result result-name="isExists" field="isExists"/> + <field-to-result field="isExists" result-name="isExists"/> </simple-method> <simple-method method-name="catalogPermissionCheck" short-description="Catalog permission logic"> @@ -444,22 +444,22 @@ under the License. <set field="categoriesUpdated" value="0" type="Integer"/> <set field="productsNotUpdated" value="0" type="Integer"/> <set field="productsUpdated" value="0" type="Integer"/> - <entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false"> + <entity-and entity-name="ProdCatalogCategory" list="prodCatalogCategoryList" filter-by-date="false"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> </entity-and> <!-- Get all categories --> <set field="parameters.productCategories" value="${groovy: []}" type="List"/> - <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList"> + <iterate list="prodCatalogCategoryList" entry="prodCatalogCategory"> <set field="rootProductCategoryId" from-field="prodCatalogCategory.productCategoryId"/> - <entity-and list="productCategoryRollupList" entity-name="ProductCategoryRollup" filter-by-date="true"> + <entity-and entity-name="ProductCategoryRollup" list="productCategoryRollupList" filter-by-date="true"> <field-map field-name="parentProductCategoryId" from-field="rootProductCategoryId"/> </entity-and> <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/> <call-simple-method method-name="createMissingCategoryAltUrlInline"/> </iterate> - <iterate entry="productCategoryList" list="parameters.productCategories"> + <iterate list="parameters.productCategories" entry="productCategoryList"> <!-- Create Product Category Alternative URLs --> <if-empty field="category"> <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true"> @@ -523,7 +523,7 @@ under the License. </condition-list> <order-by field-name="-fromDate"/> </entity-condition> - <iterate entry="productCategoryMember" list="productCategoryMemberList"> + <iterate list="productCategoryMemberList" entry="productCategoryMember"> <set field="product.productId" from-field="productCategoryMember.productId"/> <entity-condition list="ProductContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true"> <condition-list combine="and"> @@ -577,10 +577,10 @@ under the License. </simple-method> <simple-method method-name="createMissingCategoryAltUrlInline" short-description="create missing category alternative inline"> - <entity-and list="productCategoryRollups" entity-name="ProductCategoryRollup" filter-by-date="true"> + <entity-and entity-name="ProductCategoryRollup" list="productCategoryRollups" filter-by-date="true"> <field-map field-name="parentProductCategoryId" from-field="parameters.parentProductCategoryId"/> </entity-and> - <iterate entry="productCategoryRollup" list="productCategoryRollups"> + <iterate list="productCategoryRollups" entry="productCategoryRollup"> <!-- append product category to list --> <entity-one value-field="productCategory" entity-name="ProductCategory"> <field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/> Modified: ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml Sat Nov 5 12:41:35 2016 @@ -68,7 +68,7 @@ under the License. <simple-method method-name="updateContentSEOForCategory" short-description="Update SEO Content For Product Category"> <if-not-empty field="parameters.title"> - <entity-and list="productCategoryContents" entity-name="ProductCategoryContentAndInfo"> + <entity-and entity-name="ProductCategoryContentAndInfo" list="productCategoryContents"> <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/> <field-map field-name="prodCatContentTypeId" value="PAGE_TITLE"/> </entity-and> @@ -90,7 +90,7 @@ under the License. </if-not-empty> </if-not-empty> <if-not-empty field="parameters.metaKeyword"> - <entity-and list="productCategoryContents" entity-name="ProductCategoryContentAndInfo"> + <entity-and entity-name="ProductCategoryContentAndInfo" list="productCategoryContents"> <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/> <field-map field-name="prodCatContentTypeId" value="META_KEYWORD"/> </entity-and> @@ -112,7 +112,7 @@ under the License. </if-not-empty> </if-not-empty> <if-not-empty field="parameters.metaDescription"> - <entity-and list="productCategoryContents" entity-name="ProductCategoryContentAndInfo"> + <entity-and entity-name="ProductCategoryContentAndInfo" list="productCategoryContents"> <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/> <field-map field-name="prodCatContentTypeId" value="META_DESCRIPTION"/> </entity-and> Modified: ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml Sat Nov 5 12:41:35 2016 @@ -65,7 +65,7 @@ under the License. <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="roleTypeId" value="LTD_ADMIN"/> </entity-and> - <iterate entry="productCategoryRole" list="productCategoryRoles"> + <iterate list="productCategoryRoles" entry="productCategoryRole"> <!-- add this new product to the category --> <make-value value-field="newLimitRollup" entity-name="ProductCategoryRollup"/> <set field="newLimitRollup.productCategoryId" from-field="newEntity.productCategoryId"/> @@ -109,7 +109,7 @@ under the License. <simple-method method-name="addProductToCategories" short-description="Add Product to Multiple Categories"> <set-service-fields service-name="addProductToCategory" to-map="addProductToCategoryMap" map="parameters"/> <if-instance-of field="parameters.categories" class="java.util.List"> - <iterate entry="category" list="parameters.categories"> + <iterate list="parameters.categories" entry="category"> <set field="addProductToCategoryMap.productCategoryId" from-field="category"/> <call-service service-name="addProductToCategory" in-map-name="addProductToCategoryMap"/> </iterate> @@ -219,7 +219,7 @@ under the License. </simple-method> <simple-method method-name="addProductCategoryToCategories" short-description="Add ProductCategory to Categories"> <if-instance-of field="parameters.categories" class="java.util.List"> - <iterate entry="category" list="parameters.categories"> + <iterate list="parameters.categories" entry="category"> <set field="callingMethodName" value="addProductCategoryToCategories"/> <set field="checkAction" value="CREATE"/> <!-- note the the user must be associated with the parent category with the role limited permission --> @@ -310,7 +310,7 @@ under the License. </if-not-empty> <!-- add each to a list to store and then store all and let the entity engine do inserts or updates as needed; much more reliable/useful --> - <iterate entry="productCategoryMember" list="productCategoryMembers"> + <iterate list="productCategoryMembers" entry="productCategoryMember"> <clone-value value-field="productCategoryMember" new-value-field="newProductCategoryMember"/> <set field="newProductCategoryMember.productCategoryId" from-field="parameters.productCategoryIdTo"/> <field-to-list field="newProductCategoryMember" list="pcmsToStore"/> @@ -326,7 +326,7 @@ under the License. <filter-list-by-date list="productCategoryRollups" valid-date="validDate"/> </if-not-empty> - <iterate entry="productCategoryRollup" list="productCategoryRollups"> + <iterate list="productCategoryRollups" entry="productCategoryRollup"> <set field="callServiceMap.productCategoryId" from-field="productCategoryRollup.productCategoryId"/> <set field="callServiceMap.productCategoryIdTo" from-field="parameters.productCategoryIdTo"/> <set field="callServiceMap.validDate" from-field="parameters.validDate"/> @@ -362,7 +362,7 @@ under the License. </if-not-empty> <!-- add each to a list to store and then store all and let the entity engine do inserts or updates as needed; much more reliable/useful --> - <iterate entry="categoryEntity" list="categoryEntities"> + <iterate list="categoryEntities" entry="categoryEntity"> <clone-value value-field="categoryEntity" new-value-field="newCategoryEntity"/> <set field="newCategoryEntity.productCategoryId" from-field="productCategoryIdTo"/> <field-to-list field="newCategoryEntity" list="entitiesToStore"/> @@ -387,7 +387,7 @@ under the License. <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/> </entity-and> - <iterate entry="productCategoryMember" list="productCategoryMembers"> + <iterate list="productCategoryMembers" entry="productCategoryMember"> <set field="productCategoryMember.thruDate" from-field="expireTimestamp"/> <store-value value-field="productCategoryMember"/> </iterate> @@ -409,7 +409,7 @@ under the License. <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/> </entity-and> - <iterate entry="productCategoryMember" list="productCategoryMembers"> + <iterate list="productCategoryMembers" entry="productCategoryMember"> <if-compare-field field="productCategoryMember.thruDate" to-field="expireTimestamp" operator="less" type="Timestamp"> <remove-value value-field="productCategoryMember"/> </if-compare-field> @@ -548,7 +548,7 @@ under the License. <entity-and entity-name="ProductCategoryRollup" list="foundValues"> <field-map field-name="productCategoryId" from-field="parameters.oldProductCategoryId"/> </entity-and> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set field="newTempValue.productCategoryId" from-field="parameters.productCategoryId"/> <create-value value-field="newTempValue"/> @@ -558,7 +558,7 @@ under the License. <entity-and entity-name="ProductCategoryRollup" list="foundValues"> <field-map field-name="parentProductCategoryId" from-field="parameters.oldProductCategoryId"/> </entity-and> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set field="newTempValue.parentProductCategoryId" from-field="parameters.productCategoryId"/> <create-value value-field="newTempValue"/> @@ -633,7 +633,7 @@ under the License. <simple-method method-name="updateProductCategoryLink" short-description="update a ProductCategoryLink"> <entity-one entity-name="ProductCategoryLink" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-field="lookedUpValue"/> </simple-method> @@ -756,7 +756,7 @@ under the License. </condition-list> </condition-list> </entity-condition> - <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList"> + <iterate list="prodCatalogCategoryList" entry="prodCatalogCategory"> <!-- Do not do a permission check unless the ProdCatalog requires it --> <entity-one entity-name="ProdCatalog" value-field="prodCatalog" auto-field-map="false"> <field-map field-name="prodCatalogId" from-field="prodCatalogCategory.prodCatalogId"/> Modified: ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml Sat Nov 5 12:41:35 2016 @@ -65,7 +65,7 @@ under the License. </condition-list> </entity-condition> <set field="productCost" value="0" type="BigDecimal"/> - <iterate entry="costComponent" list="costComponents"> + <iterate list="costComponents" entry="costComponent"> <calculate field="productCost" decimal-scale="6"> <calcop field="costComponent.cost" operator="add"> <calcop field="productCost" operator="get"/> @@ -198,7 +198,7 @@ under the License. <!-- Now compute the costs derived from CostComponentCalc records associated with the task --> <get-related relation-name="WorkEffortCostCalc" list="weccs" value-field="task"/> <filter-list-by-date list="weccs"/> - <iterate entry="wecc" list="weccs"> + <iterate list="weccs" entry="wecc"> <clear-field field="totalCostComponentCost"/> <clear-field field="totalCostComponentTime"/> <get-related-one relation-name="CostComponentCalc" to-value-field="costComponentCalc" value-field="wecc"/> @@ -261,7 +261,7 @@ under the License. <result-to-field result-name="componentsMap"/> </call-service> <if-not-empty field="componentsMap"> - <iterate entry="componentMap" list="componentsMap"> + <iterate list="componentsMap" entry="componentMap"> <clear-field field="inputMap"/> <set field="product" from-field="componentMap.product"/> <set field="inputMap.productId" from-field="product.productId"/> @@ -297,7 +297,7 @@ under the License. <result-to-field result-name="tasks"/> <result-to-field result-name="routing"/> </call-service> - <iterate entry="task" list="tasks"> + <iterate list="tasks" entry="task"> <clear-field field="callSvcMap"/> <set from-field="task.workEffortIdTo" field="callSvcMap.workEffortId"/> <set from-field="parameters.currencyUomId" field="callSvcMap.currencyUomId"/> @@ -373,7 +373,7 @@ under the License. <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="sequenceNum"/> </entity-condition> - <iterate entry="productCostComponentCalc" list="productCostComponentCalcs"> + <iterate list="productCostComponentCalcs" entry="productCostComponentCalc"> <get-related-one relation-name="CostComponentCalc" to-value-field="costComponentCalc" value-field="productCostComponentCalc"/> <get-related-one relation-name="CustomMethod" to-value-field="customMethod" value-field="costComponentCalc"/> <if-empty field="customMethod">
