Author: erwan
Date: Thu Nov 1 21:44:10 2012
New Revision: 1404779
URL: http://svn.apache.org/viewvc?rev=1404779&view=rev
Log:
Part of OFBIZ-5059 and related to Adrian comment on dev mailing-list, move some
Party help Label from Common to Party
Modified:
ofbiz/branches/20120329_portletWidget/applications/party/config/PartyEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/party/entitydef/entitymodel.xml
ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml
Modified:
ofbiz/branches/20120329_portletWidget/applications/party/config/PartyEntityLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/config/PartyEntityLabels.xml?rev=1404779&r1=1404778&r2=1404779&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/applications/party/config/PartyEntityLabels.xml
(original)
+++
ofbiz/branches/20120329_portletWidget/applications/party/config/PartyEntityLabels.xml
Thu Nov 1 21:44:10 2012
@@ -1014,7 +1014,31 @@
<value xml:lang="en">Parent Classification Type use to filter showing
classifiction type </value>
<value xml:lang="fr">Type de classification parente à utiliser pour
filter les types de classification à visualiser</value>
</property>
-
+ <property key="FieldDescription.PartyAttribute.roleTypeGroupId">
+ <value xml:lang="en">RoleType Group which will be used in add screen
to show only roleType included in this roleTypeGroup. If this field is empty
all role type will be .</value>
+ <value xml:lang="fr">Groupe de rôle parmi lequel l'utisateur choisira
dans l'écran d'ajout. Si ce champ est vide tous les rôles apparaitront</value>
+ </property>
+ <property key="FieldDescription.PartyAttribute.partyRelationshipTypeId">
+ <value xml:lang="en">Show only Party Relationship with this
partyRelationshipTypeId, or left empty if you want to show field</value>
+ <value xml:lang="fr">indiquer le type de relation à utiliser pour
filtrer les relations à afficher, ou laisser le champ vide pour les afficher
toutes et donc montrer ce champ</value>
+ </property>
+ <property key="FieldDescription.PartyAttribute.roleTypeGroupIdFrom">
+ <value xml:lang="en">If attribute roleType is empty, give
roleTypeGroup which will be used in edit screen (add - update) to show only
roleType included in this roleTypeGroup. In this case roleTypeId will be show
in the list.</value>
+ <value xml:lang="fr">Si le champ Role est vide, indique le groupe de
rôle parmi lequel l'utisateur choisira dans l'écran d'édition (ajout -
modification). Le champ rôle d'origine sera alors affiché dans la
liste.</value>
+ </property>
+ <property key="FieldDescription.PartyAttribute.roleTypeGroupIdTo"><!--
Copy from previous label (xxxxFrom) without change -->
+ <value xml:lang="en">If attribute roleType is empty, give
roleTypeGroup which will be used in edit screen (add - update) to show only
roleType included in this roleTypeGroup. In this case roleTypeId will be show
in the list.</value>
+ <value xml:lang="fr">Si le champ Role est vide, indique le groupe de
rôle parmi lequel l'utisateur choisira dans l'écran d'édition (ajout -
modification). Le champ rôle de destination sera alors affiché dans la
liste.</value>
+ </property>
+ <property key="FieldDescription.PartyAttribute.roleTypeIdFrom">
+ <value xml:lang="en">If this field is fielded, its value will used to
filter list, will use on edit screen (add or update), the field roleType will
not be show.</value>
+ <value xml:lang="fr">Si ce champ est renseigné, cela permet de
filtrer la liste affiché et dans l'écran d'édition (ajout ou modification)
ce sera la valeur utilisé, le champ role ne sera pas affiché Ã
l'utilisateur.</value>
+ </property>
+ <property key="FieldDescription.PartyAttribute.roleTypeIdTo"><!-- Copy
from previous label (xxxxFrom) without change -->
+ <value xml:lang="en">If this field is fielded, its value will used to
filter list, will use on edit screen (add or update), the field roleType will
not be show.</value>
+ <value xml:lang="fr">Si ce champ est renseigné, cela permet de
filtrer la liste affiché et dans l'écran d'édition (ajout ou modification)
ce sera la valeur utilisé, le champ role ne sera pas affiché Ã
l'utilisateur.</value>
+ </property>
+
<!--#Eam# portletWidget-party -->
<!--#Bam# portletWidget-party -->
Modified:
ofbiz/branches/20120329_portletWidget/applications/party/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/entitydef/entitymodel.xml?rev=1404779&r1=1404778&r2=1404779&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/applications/party/entitydef/entitymodel.xml
(original)
+++
ofbiz/branches/20120329_portletWidget/applications/party/entitydef/entitymodel.xml
Thu Nov 1 21:44:10 2012
@@ -1795,6 +1795,7 @@ under the License.
</view-entity>
<entity entity-name="PartyAttribute"
package-name="org.ofbiz.party.party"
+ default-resource-name="PartyEntityLabels"
title="Party Attribute Entity">
<field name="partyId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
Modified:
ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml?rev=1404779&r1=1404778&r2=1404779&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml
(original)
+++
ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml
Thu Nov 1 21:44:10 2012
@@ -141,7 +141,7 @@ under the License.
<sort-field name="find"/>
</sort-order>
</form>
- <form name="EditParam_FindParties" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyClassificationType">
+ <form name="EditParam_FindParties" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyAttribute">
<field name="useAreaCode"><radio no-current-selected-key="N"><option
key="Y"/><option key="N"/></radio></field>
<field name="useCountryCode"><radio
no-current-selected-key="N"><option key="Y"/><option key="N"/></radio></field>
<field name="resultPortalPortletId">
@@ -242,7 +242,7 @@ under the License.
<on-event-update-area event-type="paginate" area-target="showPortlet"
area-id="${currentAreaId}"/>
</form>
- <form name="EditParam_PartyDetailsMenu" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyClassificationType">
+ <form name="EditParam_PartyDetailsMenu" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyAttribute">
<field name="ContactMechMgmtMenu"> <radio
no-current-selected-key="Y"><option key="Y"/><option key="N"/></radio></field>
<field name="PartyRelationFromsMenu"><radio
no-current-selected-key="Y"><option key="Y"/><option key="N"/></radio></field>
<field name="PartyUserLoginsMenu"> <radio
no-current-selected-key="Y"><option key="Y"/><option key="N"/></radio></field>
@@ -415,7 +415,7 @@ under the License.
</on-event-update-area>
</form>
- <form name="EditParam_PartyUserLogin" type="single"
extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml">
+ <form name="EditParam_PartyUserLogin" type="single"
extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyAttribute">
<actions>
<call-parent-actions/>
<script
location="component://party/script/org/ofbiz/party/ProfileWactions.xml#hasSecurityUpdate"/>
@@ -433,7 +433,7 @@ under the License.
<field name="submit" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
- <form name="EditParam_ContactMechMgmt" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml">
+ <form name="EditParam_ContactMechMgmt" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyAttribute">
<field name="useCountryCode"
tooltip="${uiLabelMap.Tooltips_useCountryCode}"><radio
no-current-selected-key="N"><option key="Y"/><option key="N"/></radio></field>
<field name="useAreaCode"
tooltip="${uiLabelMap.Tooltips_useAreaCode}"><radio
no-current-selected-key="N"><option key="Y"/><option key="N"/></radio></field>
<field name="useExtCode"
tooltip="${uiLabelMap.Tooltips_useExtCode}"><radio
no-current-selected-key="N"><option key="Y"/><option key="N"/></radio></field>
@@ -485,7 +485,7 @@ under the License.
<field name="updateButton"><submit /></field>
</form>
- <form name="EditParam_PartyRelationship" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PortletAttribute">
+ <form name="EditParam_PartyRelationship" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyAttribute">
<field name="titleLabel" ><text/></field>
<field name="roleTypeIdFrom">
<drop-down allow-empty="true" >
@@ -724,7 +724,7 @@ under the License.
</form>
- <form name="EditParam_PartyRoles" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PortletAttribute">
+ <form name="EditParam_PartyRoles" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyAttribute">
<actions>
<call-parent-actions/>
<script
location="component://party/script/org/ofbiz/party/ProfileWactions.xml#getParentRoleDescription"/>
@@ -829,7 +829,7 @@ under the License.
<parameter param-name="partyId" from-field="parameters.partyId"/>
</on-event-update-area>
</form>
- <form name="EditParam_PartyNote" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyClassificationType">
+ <form name="EditParam_PartyNote" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyAttribute">
<field name="canEditNote"> <radio no-current-selected-key="Y"><option
key="Y"/><option key="N"/></radio></field>
<field name="assocNoteMenu"><radio no-current-selected-key="Y"><option
key="Y"/><option key="N"/></radio></field>
<field name="updateButton">
@@ -1033,7 +1033,7 @@ under the License.
</field>
</form>
- <form name="EditParam_PartyIdentifications" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml">
+ <form name="EditParam_PartyIdentifications" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml"
default-entity-name="PartyAttribute">
<field name="parentTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}"
entity-name="PartyIdentificationType"
key-field-name="partyIdentificationTypeId">
Modified:
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml?rev=1404779&r1=1404778&r2=1404779&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml
(original)
+++
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml
Thu Nov 1 21:44:10 2012
@@ -73,30 +73,6 @@
<value xml:lang="en">Short description</value>
<value xml:lang="fr">Description courte</value>
</property>
- <property key="FieldDescription.PortletAttribute.roleTypeGroupId">
- <value xml:lang="en">RoleType Group which will be used in add screen
to show only roleType included in this roleTypeGroup. If this field is empty
all role type will be .</value>
- <value xml:lang="fr">Groupe de rôle parmi lequel l'utisateur choisira
dans l'écran d'ajout. Si ce champ est vide tous les rôles apparaitront</value>
- </property>
- <property key="FieldDescription.PortletAttribute.partyRelationshipTypeId">
- <value xml:lang="en">Show only Party Relationship with this
partyRelationshipTypeId, or left empty if you want to show field</value>
- <value xml:lang="fr">indiquer le type de relation à utiliser pour
filtrer les relations à afficher, ou laisser le champ vide pour les afficher
toutes et donc montrer ce champ</value>
- </property>
- <property key="FieldDescription.PortletAttribute.roleTypeGroupIdFrom">
- <value xml:lang="en">If attribute roleType is empty, give
roleTypeGroup which will be used in edit screen (add - update) to show only
roleType included in this roleTypeGroup. In this case roleTypeId will be show
in the list.</value>
- <value xml:lang="fr">Si le champ Role est vide, indique le groupe de
rôle parmi lequel l'utisateur choisira dans l'écran d'édition (ajout -
modification). Le champ rôle d'origine sera alors affiché dans la
liste.</value>
- </property>
- <property key="FieldDescription.PortletAttribute.roleTypeGroupIdTo"><!--
Copy from previous label (xxxxFrom) without change -->
- <value xml:lang="en">If attribute roleType is empty, give
roleTypeGroup which will be used in edit screen (add - update) to show only
roleType included in this roleTypeGroup. In this case roleTypeId will be show
in the list.</value>
- <value xml:lang="fr">Si le champ Role est vide, indique le groupe de
rôle parmi lequel l'utisateur choisira dans l'écran d'édition (ajout -
modification). Le champ rôle de destination sera alors affiché dans la
liste.</value>
- </property>
- <property key="FieldDescription.PortletAttribute.roleTypeIdFrom">
- <value xml:lang="en">If this field is fielded, its value will used to
filter list, will use on edit screen (add or update), the field roleType will
not be show.</value>
- <value xml:lang="fr">Si ce champ est renseigné, cela permet de
filtrer la liste affiché et dans l'écran d'édition (ajout ou modification)
ce sera la valeur utilisé, le champ role ne sera pas affiché Ã
l'utilisateur.</value>
- </property>
- <property key="FieldDescription.PortletAttribute.roleTypeIdTo"><!-- Copy
from previous label (xxxxFrom) without change -->
- <value xml:lang="en">If this field is fielded, its value will used to
filter list, will use on edit screen (add or update), the field roleType will
not be show.</value>
- <value xml:lang="fr">Si ce champ est renseigné, cela permet de
filtrer la liste affiché et dans l'écran d'édition (ajout ou modification)
ce sera la valeur utilisé, le champ role ne sera pas affiché Ã
l'utilisateur.</value>
- </property>
<property key="FieldDescription.PortletAttribute.titleLabel">
<value xml:lang="en">Label to use on the screenLet Title</value>
<value xml:lang="fr">Label à utiliser en tant que titre de la
screenlet</value>
