diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-09 18:13:31 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-09 18:13:31 +0200 |
| commit | 298e2032ea3a8ef7aac3a606e2cbc420760fd4c9 (patch) | |
| tree | 0832a96998574fcb45148480bf22207a9bfef439 /addons/link_tracker/controller | |
| parent | 75f60f69416625713819c810d2da33db4dc0b06c (diff) | |
| parent | 9f28139297af937990a79d4a3026ba25bb9be6fe (diff) | |
[MERGE] forward port branch saas-12 up to 9f28139
Diffstat (limited to 'addons/link_tracker/controller')
| -rw-r--r-- | addons/link_tracker/controller/main.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/link_tracker/controller/main.py b/addons/link_tracker/controller/main.py index 83c35f71300..c03cbf56813 100644 --- a/addons/link_tracker/controller/main.py +++ b/addons/link_tracker/controller/main.py @@ -10,6 +10,7 @@ from odoo.http import request class LinkTracker(http.Controller): @http.route('/r/<string:code>', type='http', auth='none', website=True) def full_url_redirect(self, code, **post): - request.env['link.tracker.click'].add_click(code, request.httprequest.remote_addr, request.session['geoip'].get('country_code'), stat_id=False) + country_code = request.session.geoip and request.session.geoip.get('country_code') or False + request.env['link.tracker.click'].add_click(code, request.httprequest.remote_addr, country_code, stat_id=False) redirect_url = request.env['link.tracker'].get_url_from_code(code) return werkzeug.utils.redirect(redirect_url or '', 301) |