svn commit: r1759024 - in /ofbiz/trunk/applications/product: template/facility/ViewContactMechs.ftl webapp/facility/WEB-INF/controller.xml

[Deepak Dixit-5]

Author: deepak
Date: Fri Sep  2 19:49:52 2016
New Revision: 1759024

URL: http://svn.apache.org/viewvc?rev=1759024&view=rev
Log:
(OFBIZ-7343) Applied slightly modified patch from jira issue
==========================================
Geo Location functionality of facility contact information screen is not working
==========================================
Thanks Pawan for your contribution.

Modified:
    ofbiz/trunk/applications/product/template/facility/ViewContactMechs.ftl
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml

Modified: ofbiz/trunk/applications/product/template/facility/ViewContactMechs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/ViewContactMechs.ftl?rev=1759024&r1=1759023&r2=1759024&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/facility/ViewContactMechs.ftl (original)
+++ ofbiz/trunk/applications/product/template/facility/ViewContactMechs.ftl Fri Sep  2 19:49:52 2016
@@ -63,7 +63,7 @@ under the License.
                     <#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!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
+                    <br /><a href="javascript:popUp('<@ofbizUrl>GetPartyGeoLocation?geoPointId=${postalAddress.geoPointId}&partyId=${facility.ownerPartyId}</@ofbizUrl>', '${popUptitle!?html}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
                   </#if>
               <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
                   <#assign telecomNumber = contactMechMap.telecomNumber!>

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1759024&r1=1759023&r2=1759024&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Fri Sep  2 19:49:52 2016
@@ -1333,6 +1333,10 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditFacilityAgreements"/>
     </request-map>
+    <request-map uri="GetPartyGeoLocation">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="GetPartyGeoLocation"/>
+    </request-map>
 
     <!-- ================ Lookup Requests ================= -->
     <request-map uri="LookupOrderHeaderAndShipInfo"><security https="true" auth="true"/><response name="success" type="view" value="LookupOrderHeaderAndShipInfo"/></request-map>
@@ -1437,6 +1441,7 @@ under the License.
     <view-map name="InventoryItemTotalsExport" type="screencsv" page="component://product/widget/facility/FacilityScreens.xml#InventoryItemTotalsExport" content-type="text/csv" encoding="none"/>
 
     <view-map name="FacilityLocationGeoLocation" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FacilityLocationGeoLocation"/>
+    <view-map name="GetPartyGeoLocation" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#GetPartyGeoLocation"/>
 
     <view-map name="LookupOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeaderAndShipInfo"/>
     <view-map name="LookupPurchaseOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupPurchaseOrderHeaderAndShipInfo"/>