diff options
| author | Jérome Maes <jem@openerp.com> | 2016-05-30 15:55:50 +0200 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2016-07-12 11:43:48 +0200 |
| commit | 3275a90ff0ee71292b32a6005d2b1a289a09154b (patch) | |
| tree | 23d33032a8d0a982e459faa6ff7440a72ba37c28 /addons/website_customer/controllers/main.py | |
| parent | ea90d4ef0ce8f65848a0d18d692acd1b46a2c520 (diff) | |
[MIG] website_customer : migraton to new api
Diffstat (limited to 'addons/website_customer/controllers/main.py')
| -rw-r--r-- | addons/website_customer/controllers/main.py | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py index e7a68808a57..5b6aec225f3 100644 --- a/addons/website_customer/controllers/main.py +++ b/addons/website_customer/controllers/main.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import openerp from openerp import SUPERUSER_ID from openerp.addons.web import http @@ -26,10 +28,9 @@ class WebsiteCustomer(http.Controller): '/customers/tag/<tag_id>/country/<country_name>-<int:country_id>/page/<int:page>', ], type='http', auth="public", website=True) def customers(self, country_id=0, page=0, country_name='', tag_id=0, **post): - cr, uid, context = request.cr, request.uid, request.context - country_obj = request.registry['res.country'] - tag_obj = request.registry['res.partner.tag'] - partner_obj = request.registry['res.partner'] + Country = request.env['res.country'] + Tag = request.env['res.partner.tag'] + Partner = request.env['res.partner'] partner_name = post.get('search', '') domain = [('website_published', '=', True), ('assigned_partner_id', '!=', False)] @@ -45,23 +46,20 @@ class WebsiteCustomer(http.Controller): domain += [('tag_ids', 'in', tag_id)] # group by country, based on customers found with the search(domain) - countries = partner_obj.read_group( - cr, openerp.SUPERUSER_ID, domain, ["id", "country_id"], - groupby="country_id", orderby="country_id", context=request.context) - country_count = partner_obj.search( - cr, openerp.SUPERUSER_ID, domain, count=True, context=request.context) + countries = Partner.sudo().read_group(domain, ["id", "country_id"], groupby="country_id", orderby="country_id") + country_count = Partner.sudo().search_count(domain) if country_id: domain += [('country_id', '=', country_id)] if not any(x['country_id'][0] == country_id for x in countries if x['country_id']): - country = country_obj.read(cr, uid, country_id, ['name'], context) + country = Country.browse(country_id).read(['name']) if country: countries.append({ 'country_id_count': 0, 'country_id': (country_id, country['name']) }) countries.sort(key=lambda d: d['country_id'] and d['country_id'][1]) - curr_country = country_obj.browse(cr, uid, country_id, context) + curr_country = Country.browse(country_id) countries.insert(0, { 'country_id_count': country_count, @@ -69,7 +67,7 @@ class WebsiteCustomer(http.Controller): }) # search customers to display - partner_count = partner_obj.search_count(cr, openerp.SUPERUSER_ID, domain, context=request.context) + partner_count = Partner.sudo().search_count(domain) # pager url = '/customers' @@ -80,22 +78,16 @@ class WebsiteCustomer(http.Controller): scope=7, url_args=post ) - partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain, - offset=pager['offset'], limit=self._references_per_page, - context=request.context) - google_map_partner_ids = ','.join(map(str, partner_ids)) - partners = partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids, request.context) + partners = Partner.sudo().search(domain, offset=pager['offset'], limit=self._references_per_page) + google_map_partner_ids = ','.join(map(str, partners.ids)) - tag_obj = request.registry['res.partner.tag'] - tag_ids = tag_obj.search(cr, uid, [('website_published', '=', True), ('partner_ids', 'in', partner_ids)], - order='classname, name ASC', context=context) - tags = tag_obj.browse(cr, uid, tag_ids, context=context) - tag = tag_id and tag_obj.browse(cr, uid, tag_id, context=context) or False + tags = Tag.search([('website_published', '=', True), ('partner_ids', 'in', partners.ids)], order='classname, name ASC') + tag = tag_id and Tag.browse(tag_id) or False values = { 'countries': countries, 'current_country_id': country_id or 0, - 'current_country': country_id and curr_country or False, + 'current_country': curr_country if country_id else False, 'partners': partners, 'google_map_partner_ids': google_map_partner_ids, 'pager': pager, @@ -111,7 +103,7 @@ class WebsiteCustomer(http.Controller): def partners_detail(self, partner_id, **post): _, partner_id = unslug(partner_id) if partner_id: - partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context) + partner = request.env['res.partner'].sudo().browse(partner_id) if partner.exists() and partner.website_published: values = {} values['main_object'] = values['partner'] = partner |
