diff options
| author | Nicolas Martinelli <nim@odoo.com> | 2016-08-25 14:04:32 +0200 |
|---|---|---|
| committer | Nicolas Martinelli <nim@odoo.com> | 2016-08-25 16:33:23 +0200 |
| commit | c82b65c8552a2ddccb9ac9990366c03199ff9d29 (patch) | |
| tree | f46e2f342b4fcabe0321221c500efa557ab85811 /addons/website_crm_partner_assign | |
| parent | 251344903d1ddee1672c4030b87349cd29fdc934 (diff) | |
[IMP] website, website_{*}: Google Maps API Key
As of June 22 2016, the use of API key is required to access the
following:
- Google Maps JavaScript API
- Google Static Maps API
- Google Street View Image API
https://developers.google.com/maps/pricing-and-plans/standard-plan-2016-update
For domains accessing the API before June 22, it will still work without
an API key. Since Google advises to use the API key, we hide the Maps if
no API key is defined.
Diffstat (limited to 'addons/website_crm_partner_assign')
| -rw-r--r-- | addons/website_crm_partner_assign/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml | 36 |
2 files changed, 21 insertions, 17 deletions
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index febc83d57b3..e7cdc15bdc7 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -255,6 +255,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, @@ -266,6 +267,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_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml index 86a03328b30..ddf3172f8b0 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml @@ -118,25 +118,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&height=485&partner_ids=#{ google_map_partner_ids }&partner_url=/partners/" + style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe> </div> - <iframe t-attf-src="/google_map/?width=898&height=485&partner_ids=#{ google_map_partner_ids }&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&height=240&partner_ids=#{ google_map_partner_ids }&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&height=240&partner_ids=#{ google_map_partner_ids }&partner_url=/partners/" + style="width:260px; height:240px; border:0; padding:0; margin:0;" scrolling="no"></iframe> + </ul> + </t> </xpath> </template> |
