Author: jleroux Date: Tue Jul 29 14:38:45 2014 New Revision: 1614368 URL: http://svn.apache.org/r1614368 Log: "Applied fix from trunk for revision: 1614366" ------------------------------------------------------------------------ r1614366 | jleroux | 2014-07-29 16:37:48 +0200 (mar. 29 juil. 2014) | 4 lignes
A patch from Pierre Smits for "AddOtherPartyRelationship allows user to select roles the selected party doesn't have" https://issues.apache.org/jira/browse/OFBIZ-5694 When a relationship must be set for a party to another party, the role selector for the party shows all roles available in the data set. This, however, must be limitied to the roles the party has. ------------------------------------------------------------------------ Modified: ofbiz/branches/release12.04/ (props changed) ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml Propchange: ofbiz/branches/release12.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1614366 Modified: ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml?rev=1614368&r1=1614367&r2=1614368&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/branches/release12.04/applications/party/widget/partymgr/PartyForms.xml Tue Jul 29 14:38:45 2014 @@ -835,8 +835,10 @@ under the License. <field name="partyIdTo" entry-name="parameters.partyId"><display/></field> <field name="roleTypeIdTo" title="${uiLabelMap.PartyPartyInTheRoleOf}"> <drop-down allow-empty="false" no-current-selected-key="_NA_"> - <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}"> + <entity-options entity-name="RoleTypeAndParty" key-field-name="roleTypeId" description="${description}"> + <entity-constraint name="partyId" value="${partyId}"/> <entity-order-by field-name="description"/> + <entity-order-by field-name="roleTypeId"/> </entity-options> </drop-down> </field>