svn commit: r1387886 - in /ofbiz/branches/release11.04: ./ framework/widget/src/org/ofbiz/widget/tree/ModelTree.java

Author: jleroux
Date: Thu Sep 20 07:07:34 2012
New Revision: 1387886

URL: http://svn.apache.org/viewvc?rev=1387886&view=rev
Log:
"Applied fix from trunk for revision: 1387884"
------------------------------------------------------------------------
r1387884 | jleroux | 2012-09-20 09:06:17 +0200 (jeu., 20 sept. 2012) | 6 lines

A patch from Daniel Riquelme " Improve Tree Widget to support Multiple PK Entities" https://issues.apache.org/jira/browse/OFBIZ-4971

The PKs are used to keep track of which nodes have been rendered when performing recursion inside Tree Widget rendering code.
Currently Multiple PKs Entities can't be used as nodes in a Tree Widget because the rendering code does not handle them.


------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1387884

Modified: ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=1387886&r1=1387885&r2=1387886&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original)
+++ ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Thu Sep 20 07:07:34 2012
@@ -664,7 +664,13 @@ public class ModelTree extends ModelWidg
                     ModelField modelField = modelEntity.getOnlyPk();
                     this.pkName = modelField.getName();
                 } else {
-                    // TODO: what to do here?
+                    List<String> pkFieldsName = modelEntity.getPkFieldNames();
+                    StringBuilder sb = new StringBuilder();
+                    for (String pk: pkFieldsName) {
+                            sb.append(pk);
+                            sb.append("|");
+                    }
+                    this.pkName = sb.toString();
                 }
             }
         }