From 2fda62ebd8707f872781da85a223ca7817b43575 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 26 Aug 2016 15:04:17 +0200
Subject: [PATCH] [FIX] website, website_{*}: Google Maps API Key

Partial backport of c82b65c8552a2ddccb9ac9990366c03199ff9d29

opw-686510
---
 addons/website/models/website.py              |  3 ++
 addons/website/views/website_templates.xml    |  9 ++++-
 .../controllers/main.py                       |  2 ++
 .../views/website_crm_partner_assign.xml      | 36 ++++++++++---------
 addons/website_customer/controllers/main.py   |  2 ++
 .../views/website_customer.xml                | 36 ++++++++++---------
 addons/website_event/views/website_event.xml  |  9 ++++-
 addons/website_google_map/controllers/main.py |  4 ++-
 .../website_google_map/views/google_map.xml   |  7 +++-
 addons/website_membership/controllers/main.py |  2 ++
 .../views/website_membership.xml              | 36 ++++++++++---------
 11 files changed, 91 insertions(+), 55 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index a1aa25f5d2a..5425550a9ff 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -656,6 +656,9 @@ class res_partner(osv.osv):
             'zoom': zoom,
             'sensor': 'false',
         }
+        google_maps_api_key = self.pool['ir.config_parameter'].get_param(cr, openerp.SUPERUSER_ID, 'google_maps_api_key', context=context)
+        if google_maps_api_key:
+            params['key'] = google_maps_api_key
         return urlplus('//maps.googleapis.com/maps/api/staticmap' , params)
 
     def google_map_link(self, cr, uid, ids, zoom=10, context=None):
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 9e4e8d95999..84b83af4f5e 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -927,7 +927,14 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
                 "fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/>
     </address>
     <!-- FORWARD-PORT UP TO SAAS-12 -->
-     <a t-att-href="res_company.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
+    <t t-if="'key=' in res_company.google_map_img()">
+        <a t-att-href="res_company.google_map_link()" target="_BLANK">
+           <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" />
+        </a>
+    </t>
+    <t t-if="'key=' not in res_company.google_map_img()">
+        <a t-att-href="res_company.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
+    </t>
 </template>
 
 <template id="contactus" name="Contact us" page="True">
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 9345de36864..222d4f5de95 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -119,6 +119,7 @@ class WebsiteCrmPartnerAssign(WebsitePartnerPage):
         partners = partners[pager['offset']:pager['offset'] + self._references_per_page]
 
         google_map_partner_ids = ','.join(map(str, [p.id for p in partners]))
+        google_maps_api_key = request.env['ir.config_parameter'].sudo().get_param('google_maps_api_key')
 
         values = {
             'countries': countries,
@@ -130,6 +131,7 @@ class WebsiteCrmPartnerAssign(WebsitePartnerPage):
             'pager': pager,
             'searches': post,
             'search_path': "%s" % werkzeug.url_encode(post),
+            'google_maps_api_key': google_maps_api_key,
         }
         return request.render("website_crm_partner_assign.index", values, status=partners and 200 or 404)
 
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 8263a788eb2..89a84922d71 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -119,25 +119,27 @@
 
 <template id="ref_country" inherit_id="website_crm_partner_assign.index" customize_show="True" name="Left World Map">
     <xpath expr="//ul[@id='reseller_countries']" position="after">
-        <!-- modal for large map -->
-        <div class="modal fade partner_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-          <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                    <h4 class="modal-title">World Map</h4>
+        <t t-if="google_maps_api_key">
+            <!-- modal for large map -->
+            <div class="modal fade partner_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+              <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                        <h4 class="modal-title">World Map</h4>
+                    </div>
+                    <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
+                    style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
                 </div>
-                <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
-                style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
+              </div>
             </div>
-          </div>
-        </div>
-        <!-- modal end -->
-        <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".partner_map_modal"><span class="fa fa-external-link" /></button></h3>
-        <ul class="nav">
-            <iframe t-attf-src="/google_map?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
-                style="width:260px; height:240px; border:0; padding:0; margin:0;" scrolling="no"></iframe>
-        </ul>
+            <!-- modal end -->
+            <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".partner_map_modal"><span class="fa fa-external-link" /></button></h3>
+            <ul class="nav">
+                <iframe t-attf-src="/google_map?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
+                    style="width:260px; height:240px; border:0; padding:0; margin:0;" scrolling="no"></iframe>
+            </ul>
+        </t>
     </xpath>
 </template>
 
diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index e7a68808a57..d5a0dc1052c 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -85,6 +85,7 @@ class WebsiteCustomer(http.Controller):
                                          context=request.context)
         google_map_partner_ids = ','.join(map(str, partner_ids))
         partners = partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids, request.context)
+        google_maps_api_key = request.env['ir.config_parameter'].sudo().get_param('google_maps_api_key')
 
         tag_obj = request.registry['res.partner.tag']
         tag_ids = tag_obj.search(cr, uid, [('website_published', '=', True), ('partner_ids', 'in', partner_ids)],
@@ -103,6 +104,7 @@ class WebsiteCustomer(http.Controller):
             'search_path': "?%s" % werkzeug.url_encode(post),
             'tag': tag,
             'tags': tags,
+            'google_maps_api_key': google_maps_api_key,
         }
         return request.website.render("website_customer.index", values)
 
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index 680b82c4a18..f13d3ec6d6d 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -68,25 +68,27 @@
 <!-- Option: left column: World Map -->
 <template id="opt_country" inherit_id="website_customer.index" customize_show="True" name="Show Map">
     <xpath expr="//div[@id='ref_left_column']" position="inside">
-        <!-- modal for large map -->
-        <div class="modal fade customer_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-          <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                    <h4 class="modal-title">World Map</h4>
+        <t t-if="google_maps_api_key">
+            <!-- modal for large map -->
+            <div class="modal fade customer_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+              <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                        <h4 class="modal-title">World Map</h4>
+                    </div>
+                    <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/"
+                    style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
                 </div>
-                <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/"
-                style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
+              </div>
             </div>
-          </div>
-        </div>
-        <!-- modal end -->
-        <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".customer_map_modal"><span class="fa fa-external-link" /></button></h3>
-        <ul class="nav">
-            <iframe t-attf-src="/google_map?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/"
-                style="width:260px; height:240px; border:0; padding:0; margin:0;" scrolling="no"></iframe>
-        </ul>
+            <!-- modal end -->
+            <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".customer_map_modal"><span class="fa fa-external-link" /></button></h3>
+            <ul class="nav">
+                <iframe t-attf-src="/google_map?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/"
+                    style="width:260px; height:240px; border:0; padding:0; margin:0;" scrolling="no"></iframe>
+            </ul>
+        </t>
     </xpath>
 </template>
 
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 019ca6fcbff..3a0b2e223b1 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -332,7 +332,14 @@
                 </div>
                 <div class="panel-body">
                     <!-- FORWARD-PORT UP TO SAAS-12 -->
-                    <a t-att-href="event.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
+                    <t t-if="'key=' in event.google_map_img()">
+                        <a t-att-href="event.google_map_link()" target="_BLANK">
+                           <img class="thumbnail img-responsive" t-att-src="event.google_map_img()" />
+                        </a>
+                    </t>
+                    <t t-if="'key=' not in event.google_map_img()">
+                        <a t-att-href="event.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
+                    </t>
                     <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-field-options='{
                         "widget": "contact",
                         "fields": ["address", "phone", "mobile", "fax", "email"]
diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py
index 991d9f87e6c..68a3f2b59f4 100644
--- a/addons/website_google_map/controllers/main.py
+++ b/addons/website_google_map/controllers/main.py
@@ -63,9 +63,11 @@ class google_map(http.Controller):
         else:
             partner_url = '/partners/'
 
+        google_maps_api_key = request.env['ir.config_parameter'].sudo().get_param('google_maps_api_key')
         # generate the map
         values = {
             'partner_url': partner_url,
-            'partner_data': json.dumps(partner_data)
+            'partner_data': json.dumps(partner_data),
+            'google_maps_api_key': google_maps_api_key,
         }
         return request.website.render("website_google_map.google_map", values)
diff --git a/addons/website_google_map/views/google_map.xml b/addons/website_google_map/views/google_map.xml
index e68b9f9e7c1..8cb7d398cab 100644
--- a/addons/website_google_map/views/google_map.xml
+++ b/addons/website_google_map/views/google_map.xml
@@ -15,7 +15,12 @@
             var odoo_partner_data = <t t-raw="partner_data"/>;
         </script>
         <div id="odoo-google-map"></div>
-        <script src="//maps.google.com/maps/api/js?sensor=false"></script>
+        <t t-if="google_maps_api_key">
+            <script t-attf-src="//maps.google.com/maps/api/js?key=#{google_maps_api_key}"></script>
+        </t>
+        <t t-if="not google_maps_api_key">
+            <script src="//maps.google.com/maps/api/js"></script>
+        </t>
         <script type="text/javascript" src="/website_google_map/static/src/js/markerclusterer_compiled.js"></script>
         <script type="text/javascript" src="/website_google_map/static/src/js/google_map.js"></script>
     </body>
diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index 7fc325bdbbb..53d3fb7c122 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -138,6 +138,7 @@ class WebsiteMembership(http.Controller):
                 count_members += len(free_partner_ids)
 
         google_map_partner_ids = ",".join(map(str, google_map_partner_ids))
+        google_maps_api_key = request.env['ir.config_parameter'].sudo().get_param('google_maps_api_key')
 
         partners = { p.id: p for p in partner_obj.browse(request.cr, SUPERUSER_ID, list(page_partner_ids), request.context)}
 
@@ -162,6 +163,7 @@ class WebsiteMembership(http.Controller):
             'pager': pager,
             'post': post,
             'search': "?%s" % werkzeug.url_encode(post),
+            'google_maps_api_key': google_maps_api_key,
         }
         return request.website.render("website_membership.index", values)
 
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml
index 8ea67e2ad91..8ff6b4a7658 100644
--- a/addons/website_membership/views/website_membership.xml
+++ b/addons/website_membership/views/website_membership.xml
@@ -104,25 +104,27 @@
 <template id="opt_index_google_map" name="Left World Map"
         customize_show="True" inherit_id="website_membership.index">
     <xpath expr="//div[@id='left_column']/ul[last()]" position="after">
-        <!-- modal for large map -->
-        <div class="modal fade partner_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-          <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                    <h4 class="modal-title">World Map</h4>
+        <t t-if="google_maps_api_key">
+            <!-- modal for large map -->
+            <div class="modal fade partner_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+              <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                        <h4 class="modal-title">World Map</h4>
+                    </div>
+                    <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
+                    style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
                 </div>
-                <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
-                style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
+              </div>
             </div>
-          </div>
-        </div>
-        <!-- modal end -->
-        <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".partner_map_modal"><span class="fa fa-external-link" /></button></h3>
-        <ul class="nav">
-            <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
-                style="width:260px; height:240px; border:0; padding:0; margin:0;"></iframe>
-        </ul>
+            <!-- modal end -->
+            <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".partner_map_modal"><span class="fa fa-external-link" /></button></h3>
+            <ul class="nav">
+                <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
+                    style="width:260px; height:240px; border:0; padding:0; margin:0;"></iframe>
+            </ul>
+        </t>
     </xpath>
 </template>