svn commit: r944622 - in /ofbiz/branches/release10.04: ./ framework/images/webapp/images/fieldlookup.js

Author: jleroux
Date: Sat May 15 12:09:58 2010
New Revision: 944622

URL: http://svn.apache.org/viewvc?rev=944622&view=rev
Log:
"Applied fix from trunk for revision: 944621"
------------------------------------------------------------------------
r944621 | jleroux | 2010-05-15 14:03:11 +0200 (sam. 15 mai 2010) | 3 lignes

A patch for "Allow to open a layer lookup from a layer lookup recursively" (https://issues.apache.org/jira/browse/OFBIZ-3693) - OFBIZ-3693

I keep the issue open because there is still a not blocking little quirk. I will have a look soon...
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 15 12:09:58 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621

Modified: ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js?rev=944622&r1=944621&r2=944622&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js Sat May 15 12:09:58 2010
@@ -156,20 +156,16 @@ var FieldLookupCounter = Class.create({
     
     setReference: function (key, ref) {
         //if key doesn't exist in the array and
-        var bool = true;
         for (itm in this.refArr) {
             if (itm == key) {
-                bool = false;
-                break;
+                prefix = key.substring(0, key.indexOf("_"));
+                key = prefix + "_" + key;
+                this.refArr[key] = ref;
+                return this.refArr[key];
             }
         }
-
-        if (bool) {
-            this.refArr[key] = ref;
-            return this.refArr[key];
-        }
-        
-        return null;
+        this.refArr[key] = ref;
+        return this.refArr[key];
     },
     
     getReference: function (key) {