summaryrefslogtreecommitdiff
path: root/addons/website_google_map
diff options
context:
space:
mode:
Diffstat (limited to 'addons/website_google_map')
-rw-r--r--addons/website_google_map/controllers/main.py4
-rw-r--r--addons/website_google_map/views/google_map_templates.xml7
2 files changed, 9 insertions, 2 deletions
diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py
index f20f2d1817b..0781ddf3da1 100644
--- a/addons/website_google_map/controllers/main.py
+++ b/addons/website_google_map/controllers/main.py
@@ -52,8 +52,10 @@ class GoogleMap(http.Controller):
else:
partner_url = '/partners/'
+ google_maps_api_key = request.env['ir.config_parameter'].sudo().get_param('google_maps_api_key')
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.render("website_google_map.google_map", values)
diff --git a/addons/website_google_map/views/google_map_templates.xml b/addons/website_google_map/views/google_map_templates.xml
index 944bcae5b1b..7b623676789 100644
--- a/addons/website_google_map/views/google_map_templates.xml
+++ b/addons/website_google_map/views/google_map_templates.xml
@@ -14,7 +14,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-else="1">
+ <script src="//maps.google.com/maps/api/js"></script>
+ </t>
<script type="text/javascript" src="/website_google_map/static/src/lib/markerclusterer.js"></script>
<script type="text/javascript" src="/website_google_map/static/src/js/website_google_map.js"></script>
</body>