From be4dddca8aa361f88675ff507808013b9bea9a84 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 23 Jun 2014 17:51:20 +0200 Subject: [PATCH] [IMP] website_hr_recruitment: use session geoip for country default value --- addons/website_hr_recruitment/controllers/main.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py index b8adadb7bda..84f1973cd8c 100644 --- a/addons/website_hr_recruitment/controllers/main.py +++ b/addons/website_hr_recruitment/controllers/main.py @@ -5,14 +5,6 @@ from openerp import SUPERUSER_ID from openerp.addons.web import http from openerp.tools.translate import _ from openerp.addons.web.http import request -import logging -_logger = logging.getLogger(__name__) - -try: - import GeoIP -except ImportError: - GeoIP = None - _logger.warn("Please install GeoIP python module to use events localisation.") class website_hr_recruitment(http.Controller): @http.route([ @@ -43,9 +35,8 @@ class website_hr_recruitment(http.Controller): countries = set(o.country_id for o in offices if o.country_id) # Default search by user country - if not country and not department and not office_id and GeoIP: - GI = GeoIP.open('/usr/share/GeoIP/GeoIP.dat', 0) - country_code = GI.country_code_by_addr(request.httprequest.remote_addr) + if not country and not department and not office_id: + country_code = request.session['geoip'].get('country_code') if country_code: country_ids = request.registry.get('res.country').search(cr, uid, [('code', '=', country_code)], context=context) if country_ids: