You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mb...@apache.org on 2015/06/20 14:06:47 UTC
svn commit: r1686583 -
/ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
Author: mbrohl
Date: Sat Jun 20 12:06:47 2015
New Revision: 1686583
URL: http://svn.apache.org/r1686583
Log:
Applied patch for OFBIZ-6492: "FTL errors at facility/control/authview/ViewContactMechs when TELECOM_NUMBER countryCode or contactNumber is blank".
Thanks Christian Carlow for reporting and providing the patch.
Modified:
ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=1686583&r1=1686582&r2=1686583&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Sat Jun 20 12:06:47 2015
@@ -66,11 +66,11 @@ under the License.
<br /><a href="javascript:popUp('<@o...@ofbizUrl>', '${popUptitle!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
</#if>
<#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
- <#assign telecomNumber = contactMechMap.telecomNumber>
+ <#assign telecomNumber = contactMechMap.telecomNumber!>
${telecomNumber.countryCode!}
<#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber!}
<#if facilityContactMech.extension?has_content>${uiLabelMap.CommonExt} ${facilityContactMech.extension}</#if>
- <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
+ <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode! = "011">
<br /><a target='_blank' href='${uiLabelMap.CommonLookupAnywhoLink}' class='buttontext'>${uiLabelMap.CommonLookupAnywho}</a>
<a target='_blank' href='${uiLabelMap.CommonLookupWhitepagesTelNumberLink}' class='buttontext'>${uiLabelMap.CommonLookupWhitepages}</a>
</#if>