Author: jleroux
Date: Wed Nov 18 10:35:08 2009
New Revision: 881713
URL: http://svn.apache.org/viewvc?rev=881713&view=rev
Log:
A patch from Chandan Khandelwal "Bug on Party ViewProfile Page"
(https://issues.apache.org/jira/browse/OFBIZ-3217) - OFBIZ-3217
Steps for reproduce error
1) Go to partymgr find screen
2) Select customer which have geoPointId [partyId : DemoCustomer ]
3) Update postal address which have geolocation
4) Remove all Contact Purposes and Go Back to profile screen
5) It generate an error due to contactMechPurposeType is undefined
I have extended the use of this patch to 2 other templates
Modified:
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
Modified:
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl?rev=881713&r1=881712&r2=881713&view=diff
==============================================================================
---
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
(original)
+++
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
Wed Nov 18 10:35:08 2009
@@ -85,8 +85,10 @@
</#if>
</#if>
<#if postalAddress.geoPointId?has_content>
- <#assign popUptitle =
contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation>
- <a
href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>',
'${popUptitle}', '450', '550')"
class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
+ <#if contactMechPurposeType?has_content>
+ <#assign popUptitle =
contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation>
+ </#if>
+ <a
href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>',
'${popUptitle?if_exists}', '450', '550')"
class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
</#if>
<#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
<#assign telecomNumber = contactMechMap.telecomNumber>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=881713&r1=881712&r2=881713&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
Wed Nov 18 10:35:08 2009
@@ -85,8 +85,10 @@
</#if>
</#if>
<#if postalAddress.geoPointId?has_content>
- <#assign popUptitle =
contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation>
- <a
href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>',
'${popUptitle}', '450', '550')"
class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
+ <#if contactMechPurposeType?has_content>
+ <#assign popUptitle =
contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation>
+ </#if>
+ <a
href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>',
'${popUptitle?if_exists}', '450', '550')"
class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
</#if>
<#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
<#assign telecomNumber = contactMechMap.telecomNumber>
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=881713&r1=881712&r2=881713&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
Wed Nov 18 10:35:08 2009
@@ -60,8 +60,10 @@
</#if>
</#if>
<#if postalAddress.geoPointId?has_content>
- <#assign popUptitle =
contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation>
- <br/><a
href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>',
'${popUptitle}', '450', '550')"
class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
+ <#if contactMechPurposeType?has_content>
+ <#assign popUptitle =
contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation>
+ </#if>
+ <br/><a
href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>',
'${popUptitle?if_exists}', '450', '550')"
class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
</#if>
<#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
<#assign telecomNumber = contactMechMap.telecomNumber>
