Author: jleroux
Date: Tue Sep 19 09:20:28 2006
New Revision: 447898
URL: http://svn.apache.org/viewvc?view=rev&rev=447898
Log:
A patch from Cameron Smith to have a better role type dropdown in screen Party
Manager::Relationships::Add Relationship
(https://issues.apache.org/jira/browse/OFBIZ-320).
Thanks Cameron.
Modified:
incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Modified:
incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl?view=diff&rev=447898&r1=447897&r2=447898
==============================================================================
---
incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
(original)
+++
incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
Tue Sep 19 09:20:28 2006
@@ -105,7 +105,7 @@
</select>
${uiLabelMap.PartyPartyOfTheRoleParty}
<select name="roleTypeIdFrom" class="selectBox">
- <#list roleTypes as roleType>
+ <#list roleTypesForCurrentParty as roleType>
<option <#if "_NA_" ==
roleType.roleTypeId>selected="selected"</#if>
value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#--
[${roleType.roleTypeId}]--></option>
</#list>
</select>
@@ -132,7 +132,7 @@
<div class="tabletext" style="font-weight: bold;">
${uiLabelMap.PartyPartyCurrentInTheRoleOf}
<select name="roleTypeIdTo" class="selectBox">
- <#list roleTypes as roleType>
+ <#list roleTypesForCurrentParty as roleType>
<option <#if "_NA_" ==
roleType.roleTypeId>selected="selected"</#if>
value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#--
[${roleType.roleTypeId}]--></option>
</#list>
</select>
Modified:
incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?view=diff&rev=447898&r1=447897&r2=447898
==============================================================================
--- incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
(original)
+++ incubator/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Tue Sep 19 09:20:28 2006
@@ -134,6 +134,11 @@
<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"/>
+ <order-by field-name="description"/>
+ <order-by field-name="roleTypeId"/>
+ </entity-condition>
<entity-condition entity-name="PartyRelationshipType"
list-name="relateTypes">
<order-by field-name="description"/>
<order-by field-name="partyRelationshipTypeId"/>
