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

Author: jleroux
Date: Sun May 23 15:23:23 2010
New Revision: 947428

URL: http://svn.apache.org/viewvc?rev=947428&view=rev
Log:
"Applied fix from trunk for revision: 947424 "
------------------------------------------------------------------------
r947424 | jleroux | 2010-05-23 17:08:57 +0200 (dim. 23 mai 2010) | 3 lignes

A patch from Sascha Rodekamp " Calendar Don't open in Lookups" (https://issues.apache.org/jira/browse/OFBIZ-3692) - OFBIZ-3780

After all the last Patches the calendar didn't opened in the lookups ... But here is the fix.
------------------------------------------------------------------------


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 Sun May 23 15:23:23 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,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392
+/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,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424

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=947428&r1=947427&r2=947428&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js Sun May 23 15:23:23 2010
@@ -616,6 +616,15 @@ function modifySubmitButton (lookupDiv)
             var replaced = new  RegExp('document.' + oldFormName, 'g');
             newLookup.getElementsByTagName('a')[0].href = link.replace(replaced, 'document.'+'form_' + GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).globalRef);
         });
+        
+        //set new calendar links
+        newLookups = $A(lookupDiv.getElementsByClassName('view-calendar'));
+        newLookups.each(function(newLookup){
+            link = $A(newLookup.getElementsByTagName('a'));
+            link.each(function(cal){
+                cal.href = cal.href.replace('document.' + oldFormName, 'document.'+'form_' + GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).globalRef);
+            });
+        });
 
         //disable the form action
         var formAction = lookupForm.getAttribute('action');