diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-02 16:28:28 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-02 16:28:28 +0200 |
| commit | 54e5bbdf3531ecfee84fb6aae627d346c2425c30 (patch) | |
| tree | 2920139e3f9b019371cb2f332a53e0ab5ff8d142 /addons/website_google_map/controllers/main.py | |
| parent | 198c080b3512e8b7fbcd9ab47d15746776d5d1a6 (diff) | |
| parent | 897b9b8fc0548c5165d30b7f20b47aa00e918f1d (diff) | |
[MERGE] forward port branch saas-10 up to 897b9b8
Diffstat (limited to 'addons/website_google_map/controllers/main.py')
| -rw-r--r-- | addons/website_google_map/controllers/main.py | 4 |
1 files changed, 3 insertions, 1 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) |