You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/09/13 11:59:08 UTC
svn commit: r996476 - in /ofbiz/trunk:
applications/accounting/webapp/accounting/reports/
applications/party/widget/partymgr/ framework/common/config/
framework/example/widget/example/
Author: jleroux
Date: Mon Sep 13 09:59:08 2010
New Revision: 996476
URL: http://svn.apache.org/viewvc?rev=996476&view=rev
Log:
Minor changes in the Example component.
Also changes from CommonPartyID to CommonPartyId (following our rules)
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl?rev=996476&r1=996475&r2=996476&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl Mon Sep 13 09:59:08 2010
@@ -82,7 +82,7 @@ under the License.
<fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_shipmentId}</fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
- <fo:block text-align="center" font-size="6pt">${uiLabelMap.CommonPartyID}</fo:block>
+ <fo:block text-align="center" font-size="6pt">${uiLabelMap.CommonPartyId}</fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center" font-size="6pt">${uiLabelMap.AccountingProductId}</fo:block>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=996476&r1=996475&r2=996476&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Mon Sep 13 09:59:08 2010
@@ -349,9 +349,9 @@ under the License.
<field name="communicationEventId" position="1"><text-find/></field>
<field name="parentCommEventId" position="2"><text-find/></field>
<!-- <field name="origCommEventId"><text-find/></field-->
- <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="partyId" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyId" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" position="2">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="RoleType">
@@ -419,7 +419,7 @@ under the License.
<field name="statusId">
<display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
</field>
- <field name="partyId" title="${uiLabelMap.CommonPartyID}">
+ <field name="partyId" title="${uiLabelMap.CommonPartyId}">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
<sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdFrom}]" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdFrom"/>
@@ -441,9 +441,9 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="orderId" position="1"><text-find/></field>
<field name="communicationEventId" position="1"><text-find/></field>
- <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="partyId" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyId" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
<field name="communicationEventTypeId" position="2">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
@@ -524,14 +524,14 @@ under the License.
<field name="communicationEventTypeId">
<display-entity entity-name="CommunicationEventType" description="${description}"/>
</field>
- <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}" sort-field="true">
+ <field name="partyIdFrom" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}" sort-field="true">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
<sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdFrom}]" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdFrom"/>
</sub-hyperlink>
</display-entity>
</field>
- <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}" sort-field="true">
+ <field name="partyIdTo" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonTo}" sort-field="true">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
<sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdTo}]" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdTo"/>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=996476&r1=996475&r2=996476&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Sep 13 09:59:08 2010
@@ -5136,7 +5136,7 @@
<value xml:lang="it">Padre</value>
<value xml:lang="zh">ä¸çº§</value>
</property>
- <property key="CommonPartyID">
+ <property key="CommonPartyId">
<value xml:lang="ar">دÙÙÙ Ø§ÙØ·Ø±Ù</value>
<value xml:lang="de">Akteur ID</value>
<value xml:lang="en">Party Id</value>
@@ -5152,6 +5152,37 @@
<value xml:lang="zh">ä¼åæ è¯</value>
<value xml:lang="zh_CN">å¢ä½æ è¯</value>
</property>
+ <property key="CommonPartyGroupName">
+ <value xml:lang="de">Gruppenname</value>
+ <value xml:lang="en">Group Name</value>
+ <value xml:lang="es">Nombre del grupo</value>
+ <value xml:lang="fr">Nom du groupe</value>
+ <value xml:lang="hi_IN">समà¥à¤¹ à¤à¤¾ नाम</value>
+ <value xml:lang="it">Nome gruppo</value>
+ <value xml:lang="nl">Groepnaam</value>
+ <value xml:lang="pt_BR">Nome do grupo</value>
+ <value xml:lang="ro">Nome Grup</value>
+ <value xml:lang="ru">ÐÐ¼Ñ Ð³ÑÑппÑ</value>
+ <value xml:lang="th">à¸à¸·à¹à¸à¸à¸¥à¸¸à¹à¸¡</value>
+ <value xml:lang="zh">ç»åç§°</value>
+ </property>
+ <property key="CommonPartyName">
+ <value xml:lang="cs">Jméno</value>
+ <value xml:lang="de">Name</value>
+ <value xml:lang="en">Name</value>
+ <value xml:lang="es">Nombre</value>
+ <value xml:lang="fr">Nom</value>
+ <value xml:lang="hi_IN">नाम</value>
+ <value xml:lang="it">Nome</value>
+ <value xml:lang="ja">Name</value>
+ <value xml:lang="nl">Naam</value>
+ <value xml:lang="pt_BR">Nome</value>
+ <value xml:lang="pt_PT">Nome</value>
+ <value xml:lang="ro">Nume</value>
+ <value xml:lang="ru">ÐмÑ</value>
+ <value xml:lang="th">à¸à¸·à¹à¸</value>
+ <value xml:lang="zh">åå</value>
+ </property>
<property key="CommonPartySkills">
<value xml:lang="de">Teilnehmerfähigkeiten</value>
<value xml:lang="en">Party Skills</value>
Modified: ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml?rev=996476&r1=996475&r2=996476&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml Mon Sep 13 09:59:08 2010
@@ -299,24 +299,24 @@ under the License.
<!-- Lookup Examples -->
<form name="ExampleLookupFields" type="single" title="">
<!-- Old style lookup (in a popup window) -->
- <field name="partyIdTo"><!-- we use partyIdTo here only to differentiate from the other partyId field we use below-->
+ <field name="partyId" title="${uiLabelMap.CommonPartyId}">
<lookup target-form-name="LookupPartyName" presentation="window"/>
</field>
<!-- Standard lookup (in a layer)-->
- <!-- passes the name in one field and the id in another -->
- <field name="partyName" title="${uiLabelMap.CommonName}">
- <lookup target-form-name="LookupPartyGroupByName" description-field-name="partyId"/>
+ <!-- passes the name in one field and the id in another, this does not work yet with autcompletion, WIP... -->
+ <field name="partyName" title="${uiLabelMap.CommonPartyGroupName}">
+ <lookup target-form-name="LookupPartyGroupByName" description-field-name="partyGroupId"/>
</field>
- <!-- This field may be hidden and the name rendered in partyName using default-value if partyId is known when loading the form-->
- <field name="partyId" title="${uiLabelMap.CommonPartyID}"><text/></field><!-- the text field is only used for rendering. In the "real life" you would use the hidden fiels commented below to pass the data to the request -->
- <!--field name="partyId"><hidden/></field-->
+ <!-- This field may be hidden and the name rendered in partyName using default-value if partyGroupId is known when loading the form-->
+ <field name="partyGroupId" title="${uiLabelMap.CommonPartyId}"><text/></field><!-- the text field is only used for rendering. In the "real life" you would use the hidden field commented below to pass the data to the request -->
+ <!--field name="partyGroupId"><hidden/></field-->
<sort-order>
<field-group>
- <sort-field name="partyIdTo"/>
+ <sort-field name="partyId"/>
</field-group>
<field-group>
<sort-field name="partyName"/>
- <sort-field name="partyId"/>
+ <sort-field name="partyGroupId"/>
</field-group>
</sort-order>
</form>