svn commit: r894277 - in /ofbiz/trunk/framework: images/webapp/images/fieldlookup.js widget/templates/htmlFormMacroLibrary.ftl

[jaz-3]

Author: jaz
Date: Mon Dec 28 23:41:21 2009
New Revision: 894277

URL: http://svn.apache.org/viewvc?rev=894277&view=rev
Log:
fixed bug in field lookup renderer which was preventing target2 (when using description-field-name); fixed bad method call in fieldlookup.js (cal_error) as well as a few typos in the error messages

Modified:
    ofbiz/trunk/framework/images/webapp/images/fieldlookup.js
    ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl

Modified: ofbiz/trunk/framework/images/webapp/images/fieldlookup.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/fieldlookup.js?rev=894277&r1=894276&r2=894277&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/fieldlookup.js Mon Dec 28 23:41:21 2009
@@ -63,7 +63,7 @@
  if (!obj_target)
  return lookup_error("Error calling the field lookup: no target control specified");
  if (obj_target.value == null)
- return cal_error("Error calling the field lookup: parameter specified is not valid tardet control");
+ return cal_error("Error calling the field lookup: parameter specified is not valid target control");
     //this.target = obj_target;
     target = obj_target;
 
@@ -79,13 +79,13 @@
     if (!obj_target)
         return lookup_error("Error calling the field lookup: no target control specified");
     if (obj_target.value == null)
-        return cal_error("Error calling the field lookup: parameter specified is not valid tardet control");
+        return cal_error("Error calling the field lookup: parameter specified is not valid target control");
     target = obj_target;
     // validate input parameters
     if (!obj_target2)
         return lookup_error("Error calling the field lookup: no target control specified");
     if (obj_target2.value == null)
-        return cal_error("Error calling the field lookup: parameter specified is not valid tardet control");
+        return lookup_error("Error calling the field lookup: parameter specified is not valid target control");
     target2 = obj_target2;
 
 

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=894277&r1=894276&r2=894277&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Dec 28 23:41:21 2009
@@ -411,7 +411,7 @@
 <div class="field-lookup"><ul>
 <li><input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></li>
 <li><#if descriptionFieldName?has_content>
- <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},'${descriptionFieldName}',<#rt/>
+ <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html}, document.${formName?html}.${descriptionFieldName},<#rt/>
  <#else>
  <a href="javascript:call_fieldlookup2(document.${formName}.${name},<#rt/>
 </#if>'${lookupFieldFormName}'<#rt>