diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-02 17:23:34 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-02 17:23:34 +0200 |
| commit | 55d2e4b7cf4465be0a56e6748d401ef22c4cc7d6 (patch) | |
| tree | 7a4eb9aea8e03676edfe12ab74793998d86820a3 /addons/website_google_map | |
| parent | a13c15fd442bbfc5c283f71c8d349e33bc70cf6a (diff) | |
| parent | bde7f883b79c6f3ae581aea06928a987827c68e4 (diff) | |
[MERGE] forward port branch saas-11 up to bde7f88
Diffstat (limited to 'addons/website_google_map')
| -rw-r--r-- | addons/website_google_map/controllers/main.py | 4 | ||||
| -rw-r--r-- | addons/website_google_map/views/google_map_templates.xml | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py index 01a547920bf..ce508cac293 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.website.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..4b0408a2b93 100644 --- a/addons/website_google_map/views/google_map_templates.xml +++ b/addons/website_google_map/views/google_map_templates.xml @@ -14,7 +14,13 @@ 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/lib/markerclusterer.js"></script> <script type="text/javascript" src="/website_google_map/static/src/js/website_google_map.js"></script> </body> |