summaryrefslogtreecommitdiff
path: root/addons/website_google_map/controllers/main.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-09-02 15:19:39 +0200
committerChristophe Simonis <chs@odoo.com>2016-09-02 15:19:39 +0200
commit897b9b8fc0548c5165d30b7f20b47aa00e918f1d (patch)
tree92f4d63e2e576e57a1045bd4ee4675ac03823c1b /addons/website_google_map/controllers/main.py
parent40c0d542d4f1de9a6d37923ae69c37dbdd682494 (diff)
parentcb1ae535f6bc2c131f662b392bcd13c3714118aa (diff)
[MERGE] forward port branch 9.0 up to cb1ae53
Diffstat (limited to 'addons/website_google_map/controllers/main.py')
-rw-r--r--addons/website_google_map/controllers/main.py4
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)