svn commit: r952253 - in /ofbiz/branches/release10.04: ./ applications/workeffort/widget/WorkEffortRequestForms.xml framework/images/webapp/images/fieldlookup.js

Author: jleroux
Date: Mon Jun  7 14:42:30 2010
New Revision: 952253

URL: http://svn.apache.org/viewvc?rev=952253&view=rev
Log:
"Applied fix from trunk for revision: 952249  "
------------------------------------------------------------------------
r952249 | jleroux | 2010-06-07 16:36:33 +0200 (lun. 07 juin 2010) | 6 lignes

Fixes "Lookup LookupCustRequestItem goes wrong when layered" (https://issues.apache.org/jira/browse/OFBIZ-3813) - OFBIZ-3813

The line bypassed was specifically added for "Lookup Layer Search of a Variant Product" (https://issues.apache.org/jira/browse/OFBIZ-3746) - OFBIZ-3746
But it did not was generalized enough, this should handle all the other cases where a link is in a cell of the result list that is not the 1st one cell


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


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortRequestForms.xml
    ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun  7 14:42:30 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,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232
+/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,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249

Modified: ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortRequestForms.xml?rev=952253&r1=952252&r2=952253&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortRequestForms.xml (original)
+++ ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortRequestForms.xml Mon Jun  7 14:42:30 2010
@@ -82,7 +82,7 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <field name="workEffortId"><hidden/></field>
         <field name="custRequestId"><lookup target-form-name="LookupCustRequest"/></field>
-        <field name="custRequestItemSeqId"><lookup presentation="window" target-form-name="LookupCustRequestItem" target-parameter="custRequestId"/></field>
+        <field name="custRequestItemSeqId"><lookup target-form-name="LookupCustRequestItem" target-parameter="custRequestId"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 </forms>
\ No newline at end of file

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=952253&r1=952252&r2=952253&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js Mon Jun  7 14:42:30 2010
@@ -744,7 +744,11 @@ function modifySubmitButton (lookupDiv)
                                 if (cellElement.tagName == 'A') {
                                     var link = cellElement.href;
                                     var liSub = link.substring(link.lastIndexOf('/')+1,(link.length));
-                                    cellElement.href = "javascript:lookupAjaxRequest('" + liSub + "')";
+                                    if (liSub.contains("javascript:set_value(")) {
+                                        cellElement.href = liSub;
+                                    } else {
+                                        cellElement.href = 'javascript:lookupAjaxRequest("' + liSub + '")';
+                                    }
                                 }
                             }
                         }