svn commit: r1680882 - in /ofbiz/branches/release14.12: ./ framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl framework/images/webapp/images/fieldlookup.js

Author: jleroux
Date: Thu May 21 14:20:43 2015
New Revision: 1680882

URL: http://svn.apache.org/r1680882
Log:
"Applied fix from trunk for revision: 1680881  "
------------------------------------------------------------------------
r1680881 | jleroux | 2015-05-21 16:18:16 +0200 (jeu. 21 mai 2015) | 10 lignes

A better patch from Adrian for "Field Lookup do not show description when widget-verbose is set to false" https://issues.apache.org/jira/browse/OFBIZ-6396

When widget verbose is set to false and using field lookup, the description of the selected object is not displayed (not using auto completion but the popup).
To reproduce : Set widget.verbose=false in framework/widget/config/widget.properties  
Clear OFBiz cache then go to : https://localhost:8443/partymgr/control/EditPartyRelationships?partyId=Company
In the partyRelationship creation form, in party Id From field, click on lookup, search, select AUTHOR_MADMAX, and so no description displayed. Using autocompletion it's fine.

jleroux: This reverts the previous patch from Gil. It did not occur to me that all the rest of the result was only commented out HTML code, so a simple trim was enough. Happy to get rid of this ugly kludge


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


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
    ofbiz/branches/release14.12/framework/images/webapp/images/fieldlookup.js

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 21 14:20:43 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680873
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881

Modified: ofbiz/branches/release14.12/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl?rev=1680882&r1=1680881&r2=1680882&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl (original)
+++ ofbiz/branches/release14.12/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl Thu May 21 14:20:43 2015
@@ -28,7 +28,7 @@ under the License.
                     </#if>
                 </#if>
             </#list>
-            <#if (displayString?trim?has_content )><!-- displayString -->${displayString?trim}<!-- --></#if>
+            <#if (displayString?trim?has_content )>${displayString?trim}</#if>
         </#list>
     </#if>
 <#else>

Modified: ofbiz/branches/release14.12/framework/images/webapp/images/fieldlookup.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/images/webapp/images/fieldlookup.js?rev=1680882&r1=1680881&r2=1680882&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/branches/release14.12/framework/images/webapp/images/fieldlookup.js Thu May 21 14:20:43 2015
@@ -834,10 +834,7 @@ lookupDescriptionLoaded.prototype.update
             data : this.allParams,
             async : false,
             success : function(result) {
-                if (result.split("displayString -->")[1]) {
-                    setLookDescription(_fieldId, result.split("displayString -->")[1].trim().split("<!--")[0].trim(),
-                            "", "");
-                }
+                setLookDescription(_fieldId, result.trim(), "", "");
             }
         });
     }