OFBiz › OFBiz - Commits

svn commit: r739660 - in /ofbiz/trunk/applications/party: webapp/partymgr/communication/ webapp/partymgr/lookup/ webapp/partymgr/party/ widget/partymgr/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mrisaliti

svn commit: r739660 - in /ofbiz/trunk/applications/party: webapp/partymgr/communication/ webapp/partymgr/lookup/ webapp/partymgr/party/ widget/partymgr/

Author: mrisaliti
Date: Sun Feb 1 00:05:16 2009
New Revision: 739660

URL: http://svn.apache.org/viewvc?rev=739660&view=rev
Log:
Artifact cleaning on party component after recent changes on xsd files (OFBIZ-2137)

Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Sun Feb 1 00:05:16 2009
@@ -20,31 +20,31 @@
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
<menu name="CommEventTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="Find" title="${uiLabelMap.CommonFind}">
- <condition><if-compare field-name="tabButtonItem" operator="not-equals" value="Find"/></condition>
+ <condition><if-compare field="tabButtonItem" operator="not-equals" value="Find"/></condition>
<link target="FindCommunicationEvents"/>
</menu-item>
<menu-item name="OverView" title="${uiLabelMap.CommonOverview}">
- <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
+ <condition><not><if-empty field="parameters.communicationEventId"/></not></condition>
<link target="ViewCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="CommunicationEvent" title="${uiLabelMap.PartyCommEvent}">
- <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
+ <condition><not><if-empty field="parameters.communicationEventId"/></not></condition>
<link target="EditCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommPurposes" title="${uiLabelMap.PartyEventPurpose}">
- <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
+ <condition><not><if-empty field="parameters.communicationEventId"/></not></condition>
<link target="UpdateCommPurposes?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommRoles" title="${uiLabelMap.PartyRoles}">
- <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
+ <condition><not><if-empty field="parameters.communicationEventId"/></not></condition>
<link target="UpdateCommRoles?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommWorkEfforts" title="${uiLabelMap.PartyCommWorkEfforts}">
- <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
+ <condition><not><if-empty field="parameters.communicationEventId"/></not></condition>
<link target="ListCommWorkEfforts?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="CommContent" title="${uiLabelMap.CommonContent}">
- <condition><not><if-empty field-name="parameters.communicationEventId"/></not></condition>
+ <condition><not><if-empty field="parameters.communicationEventId"/></not></condition>
<link target="ListCommContent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>

@@ -270,9 +270,9 @@
<form name="listLookupPartyGroup" type="list" list-name="listIt" paginate-target="LookupPartyGroup"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
- <field-map field-name="entityName" env-name="entityName"/>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" from-field="entityName"/>
</service>
</actions>

@@ -301,8 +301,8 @@
<form name="listLookupPartyClassificationGroup" type="list" list-name="listIt"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
+ <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="PartyClassificationGroup"/>
<field-map field-name="orderBy" value="description"/>
</service>
@@ -361,8 +361,8 @@
<form name="ListLookupCommEvent" type="list" list-name="listIt"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map-list-name="listIt" result-map-name="result">
- <field-map field-name="inputFields" env-name="parameters"/>
+ <service service-name="performFind" result-map-list="listIt" result-map="result">
+ <field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="CommunicationEvent"/>
</service>
</actions>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sun Feb 1 00:05:16 2009
@@ -346,12 +346,12 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PartyRate" filter-by-date="true">
- <condition-expr field-name="partyId" env-name="partyId"/>
+ <condition-expr field-name="partyId" from-field="partyId"/>
<order-by field-name="rateTypeId"/>
</entity-condition>
</actions>
<row-actions>
- <service service-name="getRateAmount" result-map-name="rateResult"/>
+ <service service-name="getRateAmount" result-map="rateResult"/>
<set field="rateDefaultAmount" from-field="rateResult.rateAmount"/>
<set field="periodTypeId" from-field="rateResult.periodTypeId"/>
<set field="rateCurrencyUomId" from-field="rateResult.rateCurrencyUomId"/>
@@ -493,11 +493,11 @@
<form name="AddPartyContent" target="updatePartyContent" type="upload" default-map-name="content"
focus-field-name="contentTypeId" header-row-style="header-row" default-table-style="basic-table">
<actions>
- <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
- <field-map field-name="statusId" env-name="content.statusId"/>
+ <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false">
+ <field-map field-name="statusId" from-field="content.statusId"/>
</entity-one>
- <entity-one entity-name="DataResource" value-name="dataResource" auto-field-map="false">
- <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
+ <entity-one entity-name="DataResource" value-field="dataResource" auto-field-map="false">
+ <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
</entity-one>
</actions>

@@ -625,8 +625,8 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
paginate="true" view-size="3" paginate-target="viewprofile" paginate-target-anchor="ListCarrierAccounts">
<actions>
- <entity-condition entity-name="PartyCarrierAccount" list-name="carrierAccounts" filter-by-date="true">
- <condition-expr field-name="partyId" env-name="parameters.partyId"></condition-expr>
+ <entity-condition entity-name="PartyCarrierAccount" list="carrierAccounts" filter-by-date="true">
+ <condition-expr field-name="partyId" from-field="parameters.partyId"></condition-expr>
<order-by field-name="fromDate"/>
</entity-condition>
</actions>
@@ -911,8 +911,8 @@
<form name="ListPreference" type="list" target="updatePreference?partyId=${partyId}" list-name="userPreferenceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true" use-row-submit="true" >
<row-actions>
- <service service-name="getUserPreference" result-map-name="values">
- <field-map field-name="userPrefTypeId" env-name="enumId"/>
+ <service service-name="getUserPreference" result-map="values">
+ <field-map field-name="userPrefTypeId" from-field="enumId"/>
</service>
<set field="partyId" from-field="values.userPrefValue"/>
<set field="visualThemeId" from-field="values.userPrefValue"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sun Feb 1 00:05:16 2009
@@ -60,9 +60,9 @@
<actions>

<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="Party" value-name="party"/>
- <entity-one entity-name="Person" value-name="lookupPerson"/>
- <entity-one entity-name="PartyGroup" value-name="lookupGroup"/>
+ <entity-one entity-name="Party" value-field="party"/>
+ <entity-one entity-name="Person" value-field="lookupPerson"/>
+ <entity-one entity-name="PartyGroup" value-field="lookupGroup"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -71,7 +71,7 @@
<condition>
<and>
<if-has-permission permission="PARTYMGR" action="_VIEW"/>
- <not><if-empty field-name="partyId"/></not>
+ <not><if-empty field="partyId"/></not>
</and>
</condition>
<widgets>
@@ -87,15 +87,15 @@
</condition>
<widgets>
<section>
- <condition><not><if-empty field-name="partyId"/></not></condition>
+ <condition><not><if-empty field="partyId"/></not></condition>
<widgets>
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileSubTabBar"/>
<container style="h1">
<section>
<condition>
<or>
- <not><if-empty field-name="lookupPerson"/></not>
- <not><if-empty field-name="lookupGroup"/></not>
+ <not><if-empty field="lookupPerson"/></not>
+ <not><if-empty field="lookupGroup"/></not>
</or>
</condition>
<widgets>
@@ -132,7 +132,7 @@
<condition>
<and>
<if-has-permission permission="SECURITY" action="_VIEW"/>
- <not><if-empty field-name="groupId"/></not>
+ <not><if-empty field="groupId"/></not>
</and>
</condition>
<widgets>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Sun Feb 1 00:05:16 2009
@@ -40,7 +40,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="partyId"/></not>
+ <not><if-empty field="partyId"/></not>
</condition>
<widgets>
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
@@ -168,7 +168,7 @@
<set field="titleProperty" value="PageTitleViewCommunication" />
<set field="tabButtonItem" value="OverView" />
<set field="parentCommEventId" from-field="parameters.parentCommEventId" />
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" />
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
</actions>
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator"
@@ -204,15 +204,15 @@
<section>
<condition>
<not>
- <if-empty field-name="communicationEvent.parentCommEventId" />
+ <if-empty field="communicationEvent.parentCommEventId" />
</not>
</condition>
<actions>
<set field="parent" value="${uiLabelMap.CommonParent}"/>
<entity-one entity-name="CommunicationEvent"
- value-name="communicationEvent">
+ value-field="communicationEvent">
<field-map field-name="communicationEventId"
- env-name="communicationEvent.parentCommEventId" />
+ from-field="communicationEvent.parentCommEventId" />
</entity-one>
</actions>
<widgets>
@@ -221,9 +221,9 @@
</section>
<section>
<actions>
- <entity-and list-name="commEvents" entity-name="CommunicationEvent">
+ <entity-and list="commEvents" entity-name="CommunicationEvent">
<field-map field-name="parentCommEventId"
- env-name="parameters.communicationEventId" />
+ from-field="parameters.communicationEventId" />
</entity-and>
</actions>
<widgets>
@@ -259,9 +259,9 @@
<section>
<condition>
<or>
- <if-compare field-name="communicationEvent.communicationEventTypeId"
+ <if-compare field="communicationEvent.communicationEventTypeId"
operator="equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="communicationEvent.communicationEventTypeId"
+ <if-compare field="communicationEvent.communicationEventTypeId"
operator="equals" value="AUTO_EMAIL_COMM" />
</or>
</condition>
@@ -269,9 +269,9 @@
<section>
<condition>
<and>
- <if-compare field-name="communicationEvent.statusId"
+ <if-compare field="communicationEvent.statusId"
operator="equals" value="COM_UNKNOWN_PARTY" />
- <if-empty field-name="communicationEvent.partyIdFrom" />
+ <if-empty field="communicationEvent.partyIdFrom" />
</and>
</condition>
<widgets>
@@ -309,7 +309,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditCommunication" />
<set field="tabButtonItem" value="CommunicationEvent" />
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" />
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
<script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventReply.groovy"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy"/>
</actions>
@@ -320,9 +320,9 @@
<section>
<condition>
<or>
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="equals" value="AUTO_EMAIL_COMM" />
</or>
</condition>
@@ -334,7 +334,7 @@
</section>
<section>
<condition>
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="equals" value="COMMENT_NOTE" />
</condition>
<widgets>
@@ -346,11 +346,11 @@
<section>
<condition>
<and>
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="not-equals" value="COMMENT_NOTE" />
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="not-equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="parameters.communicationEventTypeId"
+ <if-compare field="parameters.communicationEventTypeId"
operator="not-equals" value="AUTO_EMAIL_COMM" />
</and>
</condition>
@@ -379,7 +379,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditCommunication" />
<set field="tabButtonItem" value="CommunicationEvent" />
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
</actions>
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator"
@@ -406,9 +406,9 @@
<set field="partyId" value="${parameters.partyId}" />
<set field="partyIdFrom" value="${parameters.partyId}" />
<set field="partyIdTo" value="${parameters.partyId}" />
- <entity-one entity-name="Party" use-cache="true" value-name="party" />
- <entity-one entity-name="Person" use-cache="true" value-name="lookupPerson" />
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" />
+ <entity-one entity-name="Party" use-cache="true" value-field="party" />
+ <entity-one entity-name="Person" use-cache="true" value-field="lookupPerson" />
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" />
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer"
default-value="20" />
@@ -444,9 +444,9 @@
<set field="partyId" value="${parameters.partyId}"/>
<set field="partyIdFrom" value="${parameters.partyId}"/>
<set field="partyIdTo" value="${parameters.partyId}"/>
- <entity-one entity-name="Party" use-cache="true" value-name="party"/>
- <entity-one entity-name="Person" use-cache="true" value-name="lookupPerson"/>
- <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+ <entity-one entity-name="Party" use-cache="true" value-field="party"/>
+ <entity-one entity-name="Person" use-cache="true" value-field="lookupPerson"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
@@ -497,7 +497,7 @@
<set field="partyId" from-field="parameters.partyId"/>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
- <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
</actions>
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
@@ -606,11 +606,11 @@
<set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/>
<set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/>
<set field="communicationEventId" value="${parameters.communicationEventId}"/>
- <entity-one entity-name="CommEventContentDataResource" value-name="commEventContentDataResource">
- <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/>
- <field-map field-name="contentId" env-name="parameters.contentId"/>
- <field-map field-name="fromDate" env-name="parameters.fromDate"/>
- <field-map field-name="drDataResourceId" env-name="parameters.dataResourceId"/>
+ <entity-one entity-name="CommEventContentDataResource" value-field="commEventContentDataResource">
+ <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
+ <field-map field-name="contentId" from-field="parameters.contentId"/>
+ <field-map field-name="fromDate" from-field="parameters.fromDate"/>
+ <field-map field-name="drDataResourceId" from-field="parameters.dataResourceId"/>
</entity-one>
</actions>
<widgets>
@@ -623,7 +623,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="partyId"/></not>
+ <not><if-empty field="partyId"/></not>
</condition>
<widgets>
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
@@ -633,11 +633,11 @@
<include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommContent"/>
<section>
<condition>
- <if-regexp expr="text.*" field-name="commEventContentDataResource.drMimeTypeId" />
+ <if-regexp expr="text.*" field="commEventContentDataResource.drMimeTypeId" />
</condition>
<actions>
- <entity-one entity-name="ElectronicText" value-name="electronicText">
- <field-map field-name="dataResourceId" env-name="commEventContentDataResource.drDataResourceId"/>
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
+ <field-map field-name="dataResourceId" from-field="commEventContentDataResource.drDataResourceId"/>
</entity-one>
</actions>
<widgets>
@@ -660,7 +660,7 @@
<section>
<condition>
<not>
- <if-regexp expr="text.*" field-name="commEventContentDataResource.drMimeTypeId"/>
+ <if-regexp expr="text.*" field="commEventContentDataResource.drMimeTypeId"/>
</not>
</condition>
<widgets>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml Sun Feb 1 00:05:16 2009
@@ -31,7 +31,7 @@
<set field="labelTitleProperty" value="PartyClassifications"/>

<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="Party" value-name="party"/>
+ <entity-one entity-name="Party" value-field="party"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -55,7 +55,7 @@
<set field="labelTitleProperty" value="PartyClassificationGroupParties"/>

<set field="partyClassificationGroupId" from-field="parameters.partyClassificationGroupId"/>
- <entity-one entity-name="PartyClassificationGroup" value-name="partyClassificationGroup"/>
+ <entity-one entity-name="PartyClassificationGroup" value-field="partyClassificationGroup"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -92,7 +92,7 @@
<set field="labelTitleProperty" value="PartyClassificationGroups"/>

<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="Party" value-name="party"/>
+ <entity-one entity-name="Party" value-field="party"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -130,7 +130,7 @@

<set field="partyClassificationGroupId" from-field="parameters.partyClassificationGroupId"/>
<set field="partyId" value="" />
- <entity-one entity-name="PartyClassificationGroup" value-name="partyClassificationGroup"/>
+ <entity-one entity-name="PartyClassificationGroup" value-field="partyClassificationGroup"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml Sun Feb 1 00:05:16 2009
@@ -43,8 +43,8 @@
<form name="ListPartyInvitations" type="list" list-name="listIt" default-entity-name="PartyInvitation"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
+ <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="PartyInvitation"/>
<field-map field-name="orderBy" value="partyInvitationId"/>
</service>
@@ -90,7 +90,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PartyInvitationGroupAssoc">
- <condition-expr field-name="partyInvitationId" env-name="parameters.partyInvitationId"/>
+ <condition-expr field-name="partyInvitationId" from-field="parameters.partyInvitationId"/>
<order-by field-name="partyInvitationId"/>
</entity-condition>
</actions>
@@ -126,7 +126,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PartyInvitationRoleAssoc">
- <condition-expr field-name="partyInvitationId" env-name="parameters.partyInvitationId"/>
+ <condition-expr field-name="partyInvitationId" from-field="parameters.partyInvitationId"/>
<order-by field-name="partyInvitationId"/>
</entity-condition>
</actions>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml Sun Feb 1 00:05:16 2009
@@ -25,7 +25,7 @@
<actions>
<set field="headerItem" value="partyinv"/>
<set field="partyInvitationId" from-field="parameters.partyInvitationId"/>
- <entity-one entity-name="PartyInvitation" value-name="partyInvitation"/>
+ <entity-one entity-name="PartyInvitation" value-field="partyInvitation"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -38,7 +38,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="partyInvitation"/></not>
+ <not><if-empty field="partyInvitation"/></not>
</condition>
<widgets>
<include-menu name="PartyInvitationTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
@@ -93,7 +93,7 @@
</section>
<section>
<condition>
- <if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
+ <if-compare field="parameters.performSearch" operator="equals" value="Y"/>
</condition>
<widgets>
<container style="screenlet">
@@ -165,7 +165,7 @@
<set field="headerItem" value="partyinv"/>
<set field="tabButtonItem" value="EditPartyInvitation"/>
<set field="partyInvitationId" from-field="parameters.partyInvitationId"/>
- <entity-one entity-name="PartyInvitation" value-name="partyInvitation"/>
+ <entity-one entity-name="PartyInvitation" value-field="partyInvitation"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyInvitationDecorator">

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sun Feb 1 00:05:16 2009
@@ -76,12 +76,12 @@
<decorator-section name="body">
<section>
<condition>
- <not><if-empty field-name="party"/></not>
+ <not><if-empty field="party"/></not>
</condition>
<widgets>
<section>
<condition>
- <if-compare field-name="showOld" operator="equals" value="true" type="Boolean"/>
+ <if-compare field="showOld" operator="equals" value="true" type="Boolean"/>
</condition>
<widgets>
<container style="button-bar button-style-2">
@@ -138,7 +138,7 @@
<set field="headerItem" value="find"/>
<set field="tabButtonItem" value="viewroles"/>
<set field="labelTitleProperty" value="PartyMemberRoles"/>
- <entity-condition entity-name="RoleTypeAndParty" list-name="partyRoles">
+ <entity-condition entity-name="RoleTypeAndParty" list="partyRoles">
<condition-list combine="and">
<condition-expr field-name="partyId" operator="equals" value="${parameters.partyId}"/>
<condition-expr field-name="roleTypeId" operator="not-equals" value="_NA_"/>
@@ -205,30 +205,30 @@
<set field="labelTitleProperty" value="PartyRelationships"/>
<set field="headerItem" value="find"/>
<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="Party" value-name="party"/>
- <entity-condition entity-name="RoleType" list-name="roleTypes">
+ <entity-one entity-name="Party" value-field="party"/>
+ <entity-condition entity-name="RoleType" list="roleTypes">
<order-by field-name="description"/>
<order-by field-name="roleTypeId"/>
</entity-condition>
- <entity-condition entity-name="RoleTypeAndParty" list-name="roleTypesForCurrentParty">
- <condition-expr field-name="partyId" env-name="partyId"/>
+ <entity-condition entity-name="RoleTypeAndParty" list="roleTypesForCurrentParty">
+ <condition-expr field-name="partyId" from-field="partyId"/>
<order-by field-name="description"/>
<order-by field-name="roleTypeId"/>
</entity-condition>
- <entity-condition entity-name="PartyRelationshipType" list-name="relateTypes">
+ <entity-condition entity-name="PartyRelationshipType" list="relateTypes">
<order-by field-name="description"/>
<order-by field-name="partyRelationshipTypeId"/>
</entity-condition>
- <entity-condition entity-name="PartyRelationship" list-name="partyRelationships">
+ <entity-condition entity-name="PartyRelationship" list="partyRelationships">
<condition-list combine="or">
- <condition-expr field-name="partyIdTo" env-name="partyId"/>
- <condition-expr field-name="partyIdFrom" env-name="partyId"/>
+ <condition-expr field-name="partyIdTo" from-field="partyId"/>
+ <condition-expr field-name="partyIdFrom" from-field="partyId"/>
</condition-list>
<order-by field-name="partyIdTo"/>
<order-by field-name="partyRelationshipTypeId"/>
<order-by field-name="-fromDate"/>
</entity-condition>
- <entity-condition entity-name="SecurityGroup" list-name="securityGroups"/>
+ <entity-condition entity-name="SecurityGroup" list="securityGroups"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -239,7 +239,7 @@
<container style="lefthalf">
<section>
<condition>
- <if-compare field-name="party.partyTypeId" operator="equals" value="PERSON"/>
+ <if-compare field="party.partyTypeId" operator="equals" value="PERSON"/>
</condition>
<widgets>
<screenlet title="${uiLabelMap.PartyAddRelatedAccount}">
@@ -285,8 +285,8 @@
<set field="labelTitleProperty" value="PartyVendorInformation"/>

<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="Party" value-name="party"/>
- <entity-one entity-name="Vendor" value-name="vendor"/>
+ <entity-one entity-name="Party" value-field="party"/>
+ <entity-one entity-name="Vendor" value-field="vendor"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -322,8 +322,8 @@

<set field="partyId" from-field="parameters.partyId"/>
<set field="attrName" from-field="parameters.attrName"/>
- <entity-one entity-name="Party" value-name="party"/>
- <entity-one entity-name="PartyAttribute" value-name="attribute"/>
+ <entity-one entity-name="Party" value-field="party"/>
+ <entity-one entity-name="PartyAttribute" value-field="attribute"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -351,8 +351,8 @@
<set field="labelTitleProperty" value="PartyTaxAuthInfos"/>

<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="Party" value-name="party"/>
- <entity-and entity-name="PartyTaxAuthInfo" list-name="partyTaxInfos">
+ <entity-one entity-name="Party" value-field="party"/>
+ <entity-and entity-name="PartyTaxAuthInfo" list="partyTaxInfos">
<field-map field-name="partyId"/>
<order-by field-name="taxAuthGeoId"/>
<order-by field-name="taxAuthPartyId"/>
@@ -412,11 +412,11 @@
<section>
<condition>
<or>
- <if-compare field-name="hasViewPermission" operator="equals" value="true" type="Boolean"/>
- <if-compare field-name="hasPcmCreatePermission" operator="equals" value="true" type="Boolean"/>
- <if-compare field-name="hasPcmUpdatePermission" operator="equals" value="true" type="Boolean"/>
- <if-compare-field field-name="parameters.partyId" operator="equals" to-field-name="userLogin.partyId" type="String"/>
- <not><if-empty field-name="mechMap.partyContactMech"/></not>
+ <if-compare field="hasViewPermission" operator="equals" value="true" type="Boolean"/>
+ <if-compare field="hasPcmCreatePermission" operator="equals" value="true" type="Boolean"/>
+ <if-compare field="hasPcmUpdatePermission" operator="equals" value="true" type="Boolean"/>
+ <if-compare-field field="parameters.partyId" operator="equals" to-field="userLogin.partyId" type="String"/>
+ <not><if-empty field="mechMap.partyContactMech"/></not>
</or>
</condition>
<widgets>
@@ -449,7 +449,7 @@

<set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="PartyAndPerson" value-name="personInfo"/>
+ <entity-one entity-name="PartyAndPerson" value-field="personInfo"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -483,7 +483,7 @@

<set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="PartyAndGroup" value-name="partyGroup"/>
+ <entity-one entity-name="PartyAndGroup" value-field="partyGroup"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -517,7 +517,7 @@
<set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
<set field="partyId" from-field="parameters.partyId"/>
<set field="userLoginId" from-field="parameters.userLoginId"/>
- <entity-one entity-name="UserLogin" value-name="editUserLogin"/>
+ <entity-one entity-name="UserLogin" value-field="editUserLogin"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -595,7 +595,7 @@
<set field="labelTitleProperty" value="PageTitleEditUserLoginSecurityGroups"/>

<set field="userLoginId" from-field="parameters.userLoginId"/>
- <entity-one entity-name="UserLogin" value-name="editUserLogin"/>
+ <entity-one entity-name="UserLogin" value-field="editUserLogin"/>
<set field="partyId" from-field="parameters.partyId" default-value="${editUserLogin.partyId}"/>
</actions>
<widgets>
@@ -677,7 +677,7 @@
<set field="labelTitleProperty" value="ViewSegmentRoles"/>

<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="Party" value-name="party"/>
+ <entity-one entity-name="Party" value-field="party"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -867,7 +867,7 @@
<actions>
<set field="titleProperty" value="PageTitleAddressMatchMap"/>
<set field="headerItem" value="addrmap"/>
- <entity-condition entity-name="AddressMatchMap" list-name="addressMatchMaps">
+ <entity-condition entity-name="AddressMatchMap" list="addressMatchMaps">
<order-by field-name="sequenceNum"/>
</entity-condition>
</actions>
@@ -911,7 +911,7 @@
<set field="tabButtonItem" value="PartyContents"/>
<set field="partyId" from-field="parameters.partyId" />
<set field="contentId" from-field="parameters.contentId"/>
- <entity-one entity-name="Content" value-name="content"/>
+ <entity-one entity-name="Content" value-field="content"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -996,7 +996,7 @@
<set field="headerItem" value="accountsMain"/>
<set field="tabButtonItem" value="FinancialHistory"/>
<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="Party" value-name="party"/>
+ <entity-one entity-name="Party" value-field="party"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1004,16 +1004,16 @@
<label style="h1" text="${uiLabelMap.PartyFinancialHistory}"/>
<section>
<actions>
- <entity-condition entity-name="InvoiceAndApplAndPayment" list-name="ListInvoicesApplPayments">
+ <entity-condition entity-name="InvoiceAndApplAndPayment" list="ListInvoicesApplPayments">
<condition-list combine="and">
<condition-list combine="or">
<condition-list combine="and">
- <condition-expr field-name="partyId" env-name="partyId"/>
- <condition-expr field-name="partyIdFrom" env-name="defaultOrganizationPartyId"/>
+ <condition-expr field-name="partyId" from-field="partyId"/>
+ <condition-expr field-name="partyIdFrom" from-field="defaultOrganizationPartyId"/>
</condition-list>
<condition-list combine="and">
- <condition-expr field-name="partyId" env-name="defaultOrganizationPartyId"/>
- <condition-expr field-name="partyIdFrom" env-name="partyId"/>
+ <condition-expr field-name="partyId" from-field="defaultOrganizationPartyId"/>
+ <condition-expr field-name="partyIdFrom" from-field="partyId"/>
</condition-list>
</condition-list>
<condition-expr field-name="statusId" operator="not-equals" value="INVOICE_IN_PROCESS"/>
@@ -1025,7 +1025,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="ListInvoicesApplPayments"/></not>
+ <not><if-empty field="ListInvoicesApplPayments"/></not>
</condition>
<actions>
<set field="actualCurrency" value="false" type="Boolean"/>
@@ -1037,8 +1037,8 @@
<section>
<condition>
<and>
- <not><if-empty field-name="party.preferredCurrencyUomId"/></not>
- <if-compare-field field-name="defaultOrganizationPartyCurrencyId" operator="not-equals" to-field-name="party.preferredCurrencyUomId"/>
+ <not><if-empty field="party.preferredCurrencyUomId"/></not>
+ <if-compare-field field="defaultOrganizationPartyCurrencyId" operator="not-equals" to-field="party.preferredCurrencyUomId"/>
</and>
</condition>
<actions>
@@ -1066,8 +1066,8 @@
<section>
<condition>
<and>
- <not><if-empty field-name="party.preferredCurrencyUomId"/></not>
- <if-compare-field field-name="defaultOrganizationPartyCurrencyUomId" operator="not-equals" to-field-name="party.preferredCurrencyUomId"/>
+ <not><if-empty field="party.preferredCurrencyUomId"/></not>
+ <if-compare-field field="defaultOrganizationPartyCurrencyUomId" operator="not-equals" to-field="party.preferredCurrencyUomId"/>
</and>
</condition>
<actions>
@@ -1093,8 +1093,8 @@
<section>
<condition>
<and>
- <not><if-empty field-name="party.preferredCurrencyUomId"/></not>
- <if-compare-field field-name="defaultOrganizationPartyCurrencyId" operator="not-equals" to-field-name="party.preferredCurrencyUomId"/>
+ <not><if-empty field="party.preferredCurrencyUomId"/></not>
+ <if-compare-field field="defaultOrganizationPartyCurrencyId" operator="not-equals" to-field="party.preferredCurrencyUomId"/>
</and>
</condition>
<actions>
@@ -1120,8 +1120,8 @@
<section>
<condition>
<and>
- <not><if-empty field-name="party.preferredCurrencyUomId"/></not>
- <if-compare-field field-name="defaultOrganizationPartyCurrencyUomId" operator="not-equals" to-field-name="party.preferredCurrencyUomId"/>
+ <not><if-empty field="party.preferredCurrencyUomId"/></not>
+ <if-compare-field field="defaultOrganizationPartyCurrencyUomId" operator="not-equals" to-field="party.preferredCurrencyUomId"/>
</and>
</condition>
<actions>
@@ -1148,7 +1148,7 @@
<set field="headerItem" value="find"/>
<set field="tabButtonItem" value="preferences"/>
<set field="partyId" from-field="parameters.partyId"/>
- <entity-and entity-name="Enumeration" list-name="userPreferenceList">
+ <entity-and entity-name="Enumeration" list="userPreferenceList">
<field-map field-name="enumTypeId" value="GLOBAL_PREFERENCES"/>
</entity-and>
</actions>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml Sun Feb 1 00:05:16 2009
@@ -33,8 +33,8 @@
<section>
<condition>
<or>
- <if-compare field-name="hasViewPermission" operator="equals" value="true" type="Boolean"/>
- <if-compare field-name="hasPayInfoPermission" operator="equals" value="true" type="Boolean"/>
+ <if-compare field="hasViewPermission" operator="equals" value="true" type="Boolean"/>
+ <if-compare field="hasPayInfoPermission" operator="equals" value="true" type="Boolean"/>
</or>
</condition>
<widgets>
@@ -125,7 +125,7 @@

<set field="partyId" from-field="parameters.partyId"/>
<set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
- <entity-one entity-name="PartyIcsAvsOverride" value-name="avsOverride"/>
+ <entity-one entity-name="PartyIcsAvsOverride" value-field="avsOverride"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Sun Feb 1 00:05:16 2009
@@ -23,21 +23,21 @@
<screen name="Party">
<section>
<actions>
- <entity-and entity-name="PartyNameHistory" list-name="partyNameHistoryList">
- <field-map field-name="partyId" env-name="parameters.partyId"/>
+ <entity-and entity-name="PartyNameHistory" list="partyNameHistoryList">
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
<order-by field-name="-changeDate"/>
</entity-and>
- <entity-one entity-name="PartyAndGroup" value-name="lookupGroup">
- <field-map field-name="partyId" env-name="parameters.partyId"/>
+ <entity-one entity-name="PartyAndGroup" value-field="lookupGroup">
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-one>
- <entity-one entity-name="PartyAndPerson" value-name="lookupPerson">
- <field-map field-name="partyId" env-name="parameters.partyId"/>
+ <entity-one entity-name="PartyAndPerson" value-field="lookupPerson">
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-one>
</actions>
<widgets>
<section>
<condition>
- <not><if-empty field-name="lookupPerson"/></not>
+ <not><if-empty field="lookupPerson"/></not>
</condition>
<widgets>
<section>
@@ -50,7 +50,7 @@
<include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
<section>
<condition>
- <not><if-empty field-name="partyNameHistoryList"/></not>
+ <not><if-empty field="partyNameHistoryList"/></not>
</condition>
<widgets>
<include-form name="ViewPartyPersonHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
@@ -63,7 +63,7 @@
<include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
<section>
<condition>
- <not><if-empty field-name="partyNameHistoryList"/></not>
+ <not><if-empty field="partyNameHistoryList"/></not>
</condition>
<widgets>
<include-form name="ViewPartyPersonHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
@@ -76,7 +76,7 @@
</section>
<section>
<condition>
- <not><if-empty field-name="lookupGroup"/></not>
+ <not><if-empty field="lookupGroup"/></not>
</condition>
<widgets>
<section>
@@ -89,7 +89,7 @@
<include-form name="ViewPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
<section>
<condition>
- <not><if-empty field-name="partyNameHistoryList"/></not>
+ <not><if-empty field="partyNameHistoryList"/></not>
</condition>
<widgets>
<include-form name="ViewPartyGroupHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
@@ -102,7 +102,7 @@
<include-form name="ViewPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
<section>
<condition>
- <not><if-empty field-name="partyNameHistoryList"/></not>
+ <not><if-empty field="partyNameHistoryList"/></not>
</condition>
<widgets>
<include-form name="ViewPartyGroupHistory" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
@@ -150,8 +150,8 @@
<screen name="Attributes">
<section>
<actions>
- <entity-and entity-name="PartyAttribute" list-name="attributes">
- <field-map field-name="partyId" env-name="parameters.partyId"/>
+ <entity-and entity-name="PartyAttribute" list="attributes">
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
</actions>
<widgets>
@@ -167,8 +167,8 @@
<screen name="AvsSettings">
<section>
<actions>
- <entity-and entity-name="PartyIcsAvsOverride" list-name="avsOverride">
- <field-map field-name="partyId" env-name="parameters.partyId"/>
+ <entity-and entity-name="PartyIcsAvsOverride" list="avsOverride">
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
</actions>
<widgets>
@@ -214,8 +214,8 @@
<screen name="UserLogin">
<section>
<actions>
- <entity-and entity-name="UserLogin" list-name="userLogins">
- <field-map field-name="partyId" env-name="parameters.partyId"/>
+ <entity-and entity-name="UserLogin" list="userLogins">
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
</actions>
<widgets>
@@ -231,8 +231,8 @@
<screen name="Visits">
<section>
<actions>
- <entity-and entity-name="Visit" list-name="visits">
- <field-map field-name="partyId" env-name="parameters.partyId"/>
+ <entity-and entity-name="Visit" list="visits">
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
<order-by field-name="-fromDate"/>
<limit-range start="0" size="5"/>
</entity-and>
@@ -251,8 +251,8 @@
<section>
<actions>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
- <entity-condition entity-name="FinAccount" list-name="ownedFinAccountList" filter-by-date="true">
- <condition-expr field-name="ownerPartyId" operator="equals" env-name="parameters.partyId"/>
+ <entity-condition entity-name="FinAccount" list="ownedFinAccountList" filter-by-date="true">
+ <condition-expr field-name="ownerPartyId" operator="equals" from-field="parameters.partyId"/>
<order-by field-name="-fromDate"/>
</entity-condition>
</actions>
@@ -260,7 +260,7 @@
<section>
<condition>
<and>
- <not><if-empty field-name="ownedFinAccountList"/></not>
+ <not><if-empty field="ownedFinAccountList"/></not>
<if-has-permission permission="ACCOUNTING" action="_VIEW"/>
</and>
</condition>
@@ -270,27 +270,27 @@
<label style="h3" text="${uiLabelMap.PageTitleFinancialAccountSummary}"/>
</container>
<container style="screenlet-body">
- <iterate-section entry-name="ownedFinAccount" paginate="true" paginate-target="viewprofile" view-size="3" list-name="ownedFinAccountList">
+ <iterate-section entry="ownedFinAccount" paginate="true" paginate-target="viewprofile" view-size="3" list="ownedFinAccountList">
<section>
<actions>
- <entity-condition entity-name="FinAccountTrans" list-name="ownedFinAccountTransList">
- <condition-expr field-name="finAccountId" env-name="ownedFinAccount.finAccountId"/>
+ <entity-condition entity-name="FinAccountTrans" list="ownedFinAccountTransList">
+ <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
<order-by field-name="-transactionDate"/>
<limit-range start="0" size="5"/>
</entity-condition>
- <entity-condition entity-name="FinAccountAuth" list-name="ownedFinAccountAuthList" filter-by-date="true">
- <condition-expr field-name="finAccountId" env-name="ownedFinAccount.finAccountId"/>
+ <entity-condition entity-name="FinAccountAuth" list="ownedFinAccountAuthList" filter-by-date="true">
+ <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
<order-by field-name="-authorizationDate"/>
<limit-range start="0" size="5"/>
</entity-condition>
- <entity-one entity-name="Uom" value-name="accountCurrencyUom" auto-field-map="false" use-cache="true">
- <field-map field-name="uomId" env-name="ownedFinAccount.currencyUomId"/>
+ <entity-one entity-name="Uom" value-field="accountCurrencyUom" auto-field-map="false" use-cache="true">
+ <field-map field-name="uomId" from-field="ownedFinAccount.currencyUomId"/>
</entity-one>
- <entity-one entity-name="StatusItem" value-name="finAccountStatusItem">
- <field-map field-name="statusId" env-name="ownedFinAccount.statusId"/>
+ <entity-one entity-name="StatusItem" value-field="finAccountStatusItem">
+ <field-map field-name="statusId" from-field="ownedFinAccount.statusId"/>
</entity-one>
- <entity-one entity-name="FinAccountType" value-name="ownedFinAccountType" auto-field-map="false" use-cache="true">
- <field-map field-name="finAccountTypeId" env-name="ownedFinAccount.finAccountTypeId"/>
+ <entity-one entity-name="FinAccountType" value-field="ownedFinAccountType" auto-field-map="false" use-cache="true">
+ <field-map field-name="finAccountTypeId" from-field="ownedFinAccount.finAccountTypeId"/>
</entity-one>
</actions>
<widgets>
@@ -320,10 +320,10 @@
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>

- <entity-condition entity-name="InventoryItem" list-name="inventoryItemList">
+ <entity-condition entity-name="InventoryItem" list="inventoryItemList">
<condition-list>
<condition-expr field-name="inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"/>
- <condition-expr field-name="ownerPartyId" operator="equals" env-name="parameters.partyId"/>
+ <condition-expr field-name="ownerPartyId" operator="equals" from-field="parameters.partyId"/>
</condition-list>
<order-by field-name="-createdStamp"/>
</entity-condition>
@@ -332,7 +332,7 @@
<section>
<condition>
<not>
- <if-empty field-name="inventoryItemList"/>
+ <if-empty field="inventoryItemList"/>
</not>
</condition>
<widgets>
@@ -352,9 +352,9 @@
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <entity-condition entity-name="Subscription" list-name="subscriptionList" filter-by-date="true">
+ <entity-condition entity-name="Subscription" list="subscriptionList" filter-by-date="true">
<condition-list>
- <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId"/>
+ <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId"/>
</condition-list>
<order-by field-name="-fromDate"/>
</entity-condition>
@@ -363,7 +363,7 @@
<section>
<condition>
<not>
- <if-empty field-name="subscriptionList"/>
+ <if-empty field="subscriptionList"/>
</not>
</condition>
<widgets>
@@ -379,14 +379,14 @@
<screen name="Content">
<section>
<actions>
- <entity-condition entity-name="PartyContentType" list-name="partyContentTypes">
+ <entity-condition entity-name="PartyContentType" list="partyContentTypes">
<order-by field-name="description"/>
</entity-condition>
- <entity-condition entity-name="MimeType" list-name="mimeTypes">
+ <entity-condition entity-name="MimeType" list="mimeTypes">
<order-by field-name="description"/>
<order-by field-name="mimeTypeId"/>
</entity-condition>
- <entity-condition entity-name="RoleType" list-name="roles">
+ <entity-condition entity-name="RoleType" list="roles">
<order-by field-name="description"/>
<order-by field-name="roleTypeId"/>
</entity-condition>
@@ -406,8 +406,8 @@
<actions>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <entity-and entity-name="PartyContent" list-name="partyContent">
- <field-map field-name="partyId" env-name="parameters.partyId"/>
+ <entity-and entity-name="PartyContent" list="partyContent">
+ <field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
</actions>
<widgets>
@@ -423,8 +423,8 @@
<screen name="Notes">
<section>
<actions>
- <entity-and entity-name="PartyNoteView" list-name="notes">
- <field-map field-name="targetPartyId" env-name="parameters.partyId"/>
+ <entity-and entity-name="PartyNoteView" list="notes">
+ <field-map field-name="targetPartyId" from-field="parameters.partyId"/>
<order-by field-name="-noteDateTime"/>
</entity-and>
</actions>
@@ -456,13 +456,13 @@
<section>
<actions>
<set field="partyId" from-field="parameters.partyId"/>
- <entity-and list-name="contacts" entity-name="PartyRelationship">
- <field-map field-name="partyIdFrom" env-name="parameters.partyId"/>
+ <entity-and list="contacts" entity-name="PartyRelationship">
+ <field-map field-name="partyIdFrom" from-field="parameters.partyId"/>
<field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
<field-map field-name="roleTypeIdTo" value="CONTACT"/>
</entity-and>
- <entity-and list-name="accounts" entity-name="PartyRelationship">
- <field-map field-name="partyIdTo" env-name="parameters.partyId"/>
+ <entity-and list="accounts" entity-name="PartyRelationship">
+ <field-map field-name="partyIdTo" from-field="parameters.partyId"/>
<field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
<field-map field-name="roleTypeIdTo" value="CONTACT"/>
</entity-and>
@@ -470,7 +470,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="contacts"/></not>
+ <not><if-empty field="contacts"/></not>
</condition>
<widgets>
<screenlet title="${uiLabelMap.PartyListRelatedContacts}" navigation-form-name="ListContacts">
@@ -480,7 +480,7 @@
</section>
<section>
<condition>
- <not><if-empty field-name="accounts"/></not>
+ <not><if-empty field="accounts"/></not>
</condition>
<widgets>
<screenlet title="${uiLabelMap.PartyListRelatedAccounts}" navigation-form-name="ListAccounts">
@@ -495,7 +495,7 @@
<screen name="mytasks">
<section>
<condition>
- <if-compare-field field-name="parameters.partyId" operator="equals" to-field-name="userLogin.partyId"/>
+ <if-compare-field field="parameters.partyId" operator="equals" to-field="userLogin.partyId"/>
</condition>
<actions>
<service service-name="getWorkEffortAssignedActivities"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Sun Feb 1 00:05:16 2009
@@ -50,7 +50,7 @@
paginate-target="EditSecurityGroupPermissions" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="SecurityGroupPermission">
- <condition-expr field-name="groupId" env-name="groupId"/>
+ <condition-expr field-name="groupId" from-field="groupId"/>
<order-by field-name="permissionId"/>
</entity-condition>
</actions>
@@ -89,7 +89,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="UserLoginAndSecurityGroup">
- <condition-expr field-name="groupId" env-name="groupId"/>
+ <condition-expr field-name="groupId" from-field="groupId"/>
<order-by field-name="userLoginId"/>
</entity-condition>
</actions>
@@ -121,7 +121,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="UserLoginAndSecurityGroup">
- <condition-expr field-name="userLoginId" env-name="userLoginId"/>
+ <condition-expr field-name="userLoginId" from-field="userLoginId"/>
<order-by field-name="groupId"/>
</entity-condition>
</actions>
@@ -160,7 +160,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="ProtectedView">
- <condition-expr field-name="groupId" env-name="groupId"/>
+ <condition-expr field-name="groupId" from-field="groupId"/>
<order-by field-name="viewNameId"/>
</entity-condition>
</actions>

Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml?rev=739660&r1=739659&r2=739660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml Sun Feb 1 00:05:16 2009
@@ -75,7 +75,7 @@
<set field="labelTitleProperty" value="PartyEditSecurityGroupWithId"/>

<set field="groupId" from-field="parameters.groupId"/>
- <entity-one entity-name="SecurityGroup" value-name="securityGroup"/>
+ <entity-one entity-name="SecurityGroup" value-field="securityGroup"/>
</actions>
<widgets>
<decorator-screen name="SecurityGroupDecorator" location="${parameters.mainDecoratorLocation}">
@@ -107,7 +107,7 @@
<set field="labelTitleProperty" value="PartyPermissionSecurityGroupWithId"/>

<set field="groupId" from-field="parameters.groupId"/>
- <entity-one entity-name="SecurityGroup" value-name="securityGroup"/>
+ <entity-one entity-name="SecurityGroup" value-field="securityGroup"/>
</actions>
<widgets>
<decorator-screen name="SecurityGroupDecorator" location="${parameters.mainDecoratorLocation}">
@@ -167,7 +167,7 @@
<set field="labelTitleProperty" value="PartyUserLoginsForSecurityGroup"/>

<set field="groupId" from-field="parameters.groupId"/>
- <entity-one entity-name="SecurityGroup" value-name="securityGroup"/>
+ <entity-one entity-name="SecurityGroup" value-field="securityGroup"/>
</actions>
<widgets>
<decorator-screen name="SecurityGroupDecorator" location="${parameters.mainDecoratorLocation}">
@@ -189,7 +189,7 @@
<set field="labelTitleProperty" value="PartyProtectedViewsForSecurityGroup"/>

<set field="groupId" from-field="parameters.groupId"/>
- <entity-one entity-name="SecurityGroup" value-name="securityGroup"/>
+ <entity-one entity-name="SecurityGroup" value-field="securityGroup"/>
</actions>
<widgets>
<decorator-screen name="SecurityGroupDecorator" location="${parameters.mainDecoratorLocation}">