You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/05/05 21:13:42 UTC
svn commit: r941431 - in /ofbiz/trunk/applications/marketing:
webapp/sfa/contact/mergeContacts.ftl webapp/sfa/lead/mergeLeads.ftl
widget/sfa/forms/ContactForms.xml widget/sfa/forms/LeadForms.xml
Author: jleroux
Date: Wed May 5 19:13:42 2010
New Revision: 941431
URL: http://svn.apache.org/viewvc?rev=941431&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/webapp/sfa/contact/mergeContacts.ftl
ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl?rev=941431&r1=941430&r2=941431&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Wed May 5 19:13:42 2010
@@ -35,28 +35,28 @@ under the License.
<input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId?if_exists}" />
<table >
- <tr width="100%">
+ <tr>
<td width="20%" ></td>
- <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></b></td>
- <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></b></td>
- <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2></td>
- <br /><br />
+ <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></td>
+ <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></td>
+ <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2><br /></td>
</tr>
- <tr width="100%">
+ <tr>
<td width="20%">${uiLabelMap.PartyFirstName}</td>
<td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td>
<td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td>
<td width="20%"></td>
</tr>
- <tr width="100%">
+ <tr>
<td width="20%">${uiLabelMap.PartyLastName}</td>
<td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td>
<td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td>
<td width="20%"></td>
- </tr><br />
+ </tr>
<tr>
<td width="30"><br /><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td>
<td width="30"></td>
+ </tr>
<tr>
<td width="20%" >${uiLabelMap.PartyAddressLine1}</td>
<td width="30%">${contactInfo1.address1?if_exists}</td>
@@ -94,7 +94,7 @@ under the License.
<td width="30%">${contactInfo1.country?if_exists}</td>
<td width="30%">${contactInfo2.country?if_exists}</td>
<td width="20%"></td>
- </tr><br />
+ </tr>
<tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr>
<tr>
<td width="20%">${uiLabelMap.PartyCountryCode}</td>
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=941431&r1=941430&r2=941431&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Wed May 5 19:13:42 2010
@@ -39,28 +39,28 @@ under the License.
<input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId?if_exists}" />
<table >
- <tr width="100%">
+ <tr>
<td width="20%" ></td>
- <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></b></td>
- <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></b></td>
- <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2></td>
- <br /><br />
+ <td width="30%"><h2>${uiLabelMap.SfaFirstContact}</h2><br /></td>
+ <td width="30%"><h2>${uiLabelMap.SfaSecondContact}</h2><br /></td>
+ <td width="20%"><h2>${uiLabelMap.CommonSelect}</h2><br /></td>
</tr>
- <tr width="100%">
+ <tr>
<td width="20%">${uiLabelMap.PartyFirstName}</td>
<td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td>
<td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td>
<td width="20%"></td>
</tr>
- <tr width="100%">
+ <tr>
<td width="20%">${uiLabelMap.PartyLastName}</td>
<td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td>
<td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td>
<td width="20%"></td>
- </tr><br />
+ </tr>
<tr>
<td width="30"><br /><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td>
<td width="30"></td>
+ </tr>
<tr>
<td width="20%" >${uiLabelMap.PartyAddressLine1}</td>
<td width="30%">${contactInfo1.address1?if_exists}</td>
@@ -98,7 +98,7 @@ under the License.
<td width="30%">${contactInfo1.country?if_exists}</td>
<td width="30%">${contactInfo2.country?if_exists}</td>
<td width="20%"></td>
- </tr><br />
+ </tr>
<tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr>
<tr>
<td width="20%">${uiLabelMap.PartyCountryCode}</td>
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=941431&r1=941430&r2=941431&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:13:42 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, "${contact.partyId}", 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, "partyId", 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, "${contact.partyId}", 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, "partyId", 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=941431&r1=941430&r2=941431&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:13:42 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, "${lead.partyId}", 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, "partyId", 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, "${lead.partyId}", 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, "partyId", 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>