svn commit: r941440 - in /ofbiz/trunk/applications/marketing/widget/sfa/forms: ContactForms.xml LeadForms.xml

[jleroux]

Author: jleroux
Date: Wed May  5 19:32:24 2010
New Revision: 941440

URL: http://svn.apache.org/viewvc?rev=941440&view=rev
Log:
A patch from Blas Rodriguez Somoza " Internal error when rendering SFA -> Merge 
contacts and SFA->Merge Lead (Ofbiz Demo)" 
(https://issues.apache.org/jira/browse/OFBIZ-3642) - OFBIZ-3642

When rendering "Merge contacts" and "Merge Lead" there are an internal error 
and the page don't finish rendering.

CONTACTS
log error:
bsh.TokenMgrError: Lexical error at line 1, column 78. Encountered: <EOF> after 
: "\"${contact.partyId;"
at bsh.ParserTokenManager.getNextToken(Unknown Source)

The problem comes from
/marketing/widget/sfa/forms/ContactForms.xml#MergeContacts
fields: partyIdTo and partyIdFrom

LEADS
log error:
bsh.TokenMgrError: Lexical error at line 1, column 75. Encountered: <EOF> after 
: "\"${lead.partyId;"
at bsh.ParserTokenManager.getNextToken(Unknown Source)

the problem comes from
/marketing/widget/sfa/forms/LeadForms.xml#MergeLeads
fields: partyIdTo and partyIdFrom

Modified:
    ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=941440&r1=941439&r2=941440&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml 
(original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Wed 
May  5 19:32:24 2010
@@ -159,12 +159,12 @@ under the License.
         </actions>
         <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" 
position="1">
             <drop-down allow-empty="false">
-               <list-options list-name="partyList" key-name="contact.partyId"  
list-entry-name="contact" 
description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, 
&quot;${contact.partyId}&quot;, false)} [${contact.partyId}]"/>
+               <list-options list-name="partyList" key-name="contact.partyId"  
list-entry-name="contact" 
description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, 
&quot;partyId&quot;, false)} ${contact.partyId}"/>
             </drop-down>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" 
position="2">
             <drop-down allow-empty="false">
-                <list-options list-name="partyList" key-name="contact.partyId" 
 list-entry-name="contact" 
description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, 
&quot;${contact.partyId}&quot;, false)} : [${contact.partyId}]"/>
+                <list-options list-name="partyList" key-name="contact.partyId" 
 list-entry-name="contact" 
description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, 
&quot;partyId&quot;, false)} ${contact.partyId}"/>
             </drop-down>
         </field>
         <field name="submitButton" position="3" 
title="${uiLabelMap.SfaMergeContacts}" widget-style="buttontext" 
tooltip-style="button-text"><submit button-type="text-link"/></field>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=941440&r1=941439&r2=941440&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Wed May  
5 19:32:24 2010
@@ -102,12 +102,12 @@ under the License.
         </actions>
         <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" 
position="1">
             <drop-down allow-empty="false">
-               <list-options list-name="partyList" key-name="lead.partyId"  
list-entry-name="lead" 
description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, 
&quot;${lead.partyId}&quot;, false)} [${lead.partyId}]"/>
+               <list-options list-name="partyList" key-name="lead.partyId"  
list-entry-name="lead" 
description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, 
&quot;partyId&quot;, false)} ${lead.partyId}"/>
             </drop-down>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" 
position="2">
             <drop-down allow-empty="false">
-               <list-options list-name="partyList" key-name="lead.partyId"  
list-entry-name="lead" 
description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, 
&quot;${lead.partyId}&quot;, false)} [${lead.partyId}]"/>
+               <list-options list-name="partyList" key-name="lead.partyId"  
list-entry-name="lead" 
description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, 
&quot;partyId&quot;, false)} ${lead.partyId}"/>
             </drop-down>
         </field>
         <field name="submitButton" position="3" 
title="${uiLabelMap.SfaMergeLeads}" widget-style="buttontext" 
tooltip-style="button-text"><submit button-type="text-link"/></field>