svn commit: r941444 - in /ofbiz/branches/release10.04: ./ applications/marketing/widget/
Locked
svn commit: r941444 - in /ofbiz/branches/release10.04: ./ applications/marketing/widget/
 
|
Author: jleroux
Date: Wed May 5 19:40:50 2010 New Revision: 941444 URL: http://svn.apache.org/viewvc?rev=941444&view=rev Log: "Applied fix from trunk for revision: 941440" ------------------------------------------------------------------------ r941440 | jleroux | 2010-05-05 21:32:24 +0200 (mer. 05 mai 2010) | 22 lignes 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/branches/release10.04/ (props changed) ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/LeadForms.xml Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 5 19:40:50 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,941199,941261 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941199,941261,941440 Modified: ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ContactForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=941444&r1=941443&r2=941444&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ContactForms.xml (original) +++ ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ContactForms.xml Wed May 5 19:40:50 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/branches/release10.04/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=941444&r1=941443&r2=941444&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/LeadForms.xml Wed May 5 19:40:50 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> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |