svn commit: r783527 - /ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java

[apatel-2]

Author: apatel
Date: Wed Jun 10 21:33:54 2009
New Revision: 783527

URL: http://svn.apache.org/viewvc?rev=783527&view=rev
Log:
Fixed PartyRelationship member entity alias. It was conflicting with PartyRole entity alias.

Modified:
    ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java

Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=783527&r1=783526&r2=783527&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java Wed Jun 10 21:33:54 2009
@@ -1090,13 +1090,13 @@
             String partyRelationshipTypeId = (String) context.get("partyRelationshipTypeId");
             if (UtilValidate.isNotEmpty(partyRelationshipTypeId)) {
                 // add relation to view
-                dynamicView.addMemberEntity("PR", "PartyRelationship");
-                dynamicView.addAlias("PR", "partyIdTo");
-                dynamicView.addAlias("PR", "partyRelationshipTypeId");
-                dynamicView.addViewLink("PT", "PR", Boolean.FALSE, ModelKeyMap.makeKeyMapList("partyId", "partyIdTo"));
+                dynamicView.addMemberEntity("PRSHP", "PartyRelationship");
+                dynamicView.addAlias("PRSHP", "partyIdTo");
+                dynamicView.addAlias("PRSHP", "partyRelationshipTypeId");
+                dynamicView.addViewLink("PT", "PRSHP", Boolean.FALSE, ModelKeyMap.makeKeyMapList("partyId", "partyIdTo"));
                 String partyIdFrom = userLogin.getString("partyId");
                 paramList = paramList + "&partyIdFrom=" + partyIdFrom;
-                dynamicView.addAlias("PR", "partyIdFrom");
+                dynamicView.addAlias("PRSHP", "partyIdFrom");
                 // add the expr
                 andExprs.add(EntityCondition.makeCondition(
                         EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("partyIdFrom"), EntityOperator.EQUALS, EntityFunction.UPPER(partyIdFrom)),