From 631019b865cb5daa992753b48907bea2e16d1cf6 Mon Sep 17 00:00:00 2001 From: Ravi Gadhia Date: Tue, 31 May 2016 14:12:40 +0200 Subject: [PATCH] [MIG] website_membership: migration to new api --- addons/website_membership/__init__.py | 3 + addons/website_membership/__openerp__.py | 3 + .../controllers/__init__.py | 3 + addons/website_membership/controllers/main.py | 87 +++++++++---------- .../data/membership_demo.xml | 7 +- addons/website_membership/models/__init__.py | 3 + .../website_membership/models/membership.py | 20 +++-- .../security/website_membership.xml | 6 +- .../views/website_membership_templates.xml | 6 +- 9 files changed, 74 insertions(+), 64 deletions(-) diff --git a/addons/website_membership/__init__.py b/addons/website_membership/__init__.py index 9f86759e32b..ac0011716f6 100644 --- a/addons/website_membership/__init__.py +++ b/addons/website_membership/__init__.py @@ -1,2 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import controllers import models diff --git a/addons/website_membership/__openerp__.py b/addons/website_membership/__openerp__.py index 787e3f026ca..9fc58ed9835 100644 --- a/addons/website_membership/__openerp__.py +++ b/addons/website_membership/__openerp__.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + { 'name': 'Associations: Members', 'summary': 'Online Directory of Members', diff --git a/addons/website_membership/controllers/__init__.py b/addons/website_membership/controllers/__init__.py index 8ee9bae18d9..f48716d3a69 100644 --- a/addons/website_membership/controllers/__init__.py +++ b/addons/website_membership/controllers/__init__.py @@ -1 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import main diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py index 7fc325bdbbb..c682dca2ad5 100644 --- a/addons/website_membership/controllers/main.py +++ b/addons/website_membership/controllers/main.py @@ -1,14 +1,15 @@ # -*- coding: utf-8 -*- -from openerp import SUPERUSER_ID -from openerp.addons.web import http -from openerp.addons.web.http import request -from openerp.addons.website.models.website import unslug -from openerp.tools import DEFAULT_SERVER_DATE_FORMAT -from openerp.tools.translate import _ +# Part of Odoo. See LICENSE file for full copyright and licensing details. -import time import werkzeug.urls +from odoo import fields + +from odoo.addons.web import http +from odoo.addons.web.http import request +from odoo.addons.website.models.website import unslug +from odoo.tools.translate import _ + class WebsiteMembership(http.Controller): _references_per_page = 20 @@ -30,14 +31,14 @@ class WebsiteMembership(http.Controller): '/members/association//country//page/', ], type='http', auth="public", website=True) def members(self, membership_id=None, country_name=None, country_id=0, page=1, **post): - cr, uid, context = request.cr, request.uid, request.context - product_obj = request.registry['product.product'] - country_obj = request.registry['res.country'] - membership_line_obj = request.registry['membership.membership_line'] - partner_obj = request.registry['res.partner'] + Product = request.env['product.product'] + Country = request.env['res.country'] + MembershipLine = request.env['membership.membership_line'] + Partner = request.env['res.partner'] + post_name = post.get('search') or post.get('name', '') current_country = None - today = time.strftime(DEFAULT_SERVER_DATE_FORMAT) + today = fields.Date.today() # base domain for groupby / searches base_line_domain = [ @@ -47,34 +48,30 @@ class WebsiteMembership(http.Controller): if membership_id and membership_id != 'free': membership_id = int(membership_id) base_line_domain.append(('membership_id', '=', membership_id)) - membership = product_obj.browse(cr, uid, membership_id, context=context) + membership = Product.browse(membership_id) else: membership = None if post_name: - base_line_domain += ['|', ('partner.name', 'ilike', post_name), - ('partner.website_description', 'ilike', post_name)] + base_line_domain += ['|', ('partner.name', 'ilike', post_name), ('partner.website_description', 'ilike', post_name)] # group by country, based on all customers (base domain) if membership_id != 'free': - membership_line_ids = membership_line_obj.search(cr, SUPERUSER_ID, base_line_domain, context=context) - country_domain = [('member_lines', 'in', membership_line_ids)] + membership_lines = MembershipLine.sudo().search(base_line_domain) + country_domain = [('member_lines', 'in', membership_lines.ids)] if not membership_id: country_domain = ['|', country_domain[0], ('membership_state', '=', 'free')] else: - membership_line_ids = [] country_domain = [('membership_state', '=', 'free')] if post_name: - country_domain += ['|', ('name', 'ilike', post_name), - ('website_description', 'ilike', post_name)] - countries = partner_obj.read_group( - cr, SUPERUSER_ID, country_domain + [("website_published", "=", True)], ["id", "country_id"], - groupby="country_id", orderby="country_id", context=request.context) + country_domain += ['|', ('name', 'ilike', post_name), ('website_description', 'ilike', post_name)] + + countries = Partner.sudo().read_group(country_domain + [("website_published", "=", True)], ["id", "country_id"], groupby="country_id", orderby="country_id") countries_total = sum(country_dict['country_id_count'] for country_dict in countries) line_domain = list(base_line_domain) if country_id: line_domain.append(('partner.country_id', '=', country_id)) - current_country = country_obj.read(cr, uid, country_id, ['id', 'name'], context) + current_country = Country.browse(country_id).read(['id', 'name'])[0] if not any(x['country_id'][0] == country_id for x in countries if x['country_id']): countries.append({ 'country_id_count': 0, @@ -89,57 +86,60 @@ class WebsiteMembership(http.Controller): }) # format domain for group_by and memberships - membership_ids = product_obj.search(cr, uid, [('membership', '=', True)], order="website_sequence", context=context) - memberships = product_obj.browse(cr, uid, membership_ids, context=context) + memberships = Product.search([('membership', '=', True)], order="website_sequence") + # make sure we don't access to lines with unpublished membershipts - line_domain.append(('membership_id', 'in', membership_ids)) + line_domain.append(('membership_id', 'in', memberships.ids)) limit = self._references_per_page offset = limit * (page - 1) count_members = 0 - membership_line_ids = [] + membership_lines = MembershipLine.sudo() # displayed non-free membership lines if membership_id != 'free': - count_members = membership_line_obj.search_count(cr, SUPERUSER_ID, line_domain, context=context) + count_members = MembershipLine.sudo().search_count(line_domain) if offset <= count_members: - membership_line_ids = tuple(membership_line_obj.search(cr, SUPERUSER_ID, line_domain, offset, limit, context=context)) - membership_lines = membership_line_obj.browse(cr, uid, membership_line_ids, context=context) - # TODO: Following line can be deleted in master. Kept for retrocompatibility. - membership_lines = sorted(membership_lines, key=lambda x: x.membership_id.website_sequence) + membership_lines = MembershipLine.sudo().search(line_domain, offset, limit) page_partner_ids = set(m.partner.id for m in membership_lines) + page_partner = membership_lines.mapped('partner') + # get google maps localization of partners google_map_partner_ids = [] if request.env.ref('website_membership.opt_index_google_map').customize_show: - membership_lines_ids = membership_line_obj.search(cr, uid, line_domain, context=context) - google_map_partner_ids = membership_line_obj.get_published_companies(cr, uid, membership_line_ids, limit=2000, context=context) + google_map_partner_ids = MembershipLine.search(line_domain).get_published_companies(limit=2000) search_domain = [('membership_state', '=', 'free'), ('website_published', '=', True)] if post_name: search_domain += ['|', ('name', 'ilike', post_name), ('website_description', 'ilike', post_name)] if country_id: search_domain += [('country_id', '=', country_id)] - free_partner_ids = partner_obj.search(cr, SUPERUSER_ID, search_domain, context=context) + free_partners = Partner.sudo().search(search_domain) + free_partner_ids = [] + + memberships_data = [] for membership_record in memberships: memberships_data.append({'id': membership_record.id, 'name': membership_record.name}) + memberships_partner_ids = {} for line in membership_lines: memberships_partner_ids.setdefault(line.membership_id.id, []).append(line.partner.id) - if free_partner_ids: + + if free_partners: memberships_data.append({'id': 'free', 'name': _('Free Members')}) if not membership_id or membership_id == 'free': if count_members < offset + limit: free_start = max(offset - count_members, 0) free_end = max(offset + limit - count_members, 0) - memberships_partner_ids['free'] = free_partner_ids[free_start:free_end] + memberships_partner_ids['free'] = free_partners.ids[free_start:free_end] page_partner_ids |= set(memberships_partner_ids['free']) google_map_partner_ids += free_partner_ids[:2000-len(google_map_partner_ids)] count_members += len(free_partner_ids) google_map_partner_ids = ",".join(map(str, google_map_partner_ids)) - partners = { p.id: p for p in partner_obj.browse(request.cr, SUPERUSER_ID, list(page_partner_ids), request.context)} + partners = {p.id: p for p in Partner.sudo().browse(list(page_partner_ids))} base_url = '/members%s%s' % ('/association/%s' % membership_id if membership_id else '', '/country/%s' % country_id if country_id else '') @@ -149,9 +149,6 @@ class WebsiteMembership(http.Controller): values = { 'partners': partners, - 'membership_lines': membership_lines, # TODO: This line can be deleted in master. Kept for retrocompatibility. - 'memberships': memberships, # TODO: This line too. - 'membership': membership, # TODO: This line too. 'memberships_data': memberships_data, 'memberships_partner_ids': memberships_partner_ids, 'membership_id': membership_id, @@ -170,8 +167,8 @@ class WebsiteMembership(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) - if partner.exists() and partner.website_published: + partner = request.env['res.partner'].sudo().browse(partner_id) + if partner.exists() and partner.website_published: # TODO should be done with access rules values = {} values['main_object'] = values['partner'] = partner return request.website.render("website_membership.partner", values) diff --git a/addons/website_membership/data/membership_demo.xml b/addons/website_membership/data/membership_demo.xml index 9b43983711a..6c742c7a91b 100644 --- a/addons/website_membership/data/membership_demo.xml +++ b/addons/website_membership/data/membership_demo.xml @@ -1,4 +1,6 @@ - + + + @@ -16,4 +18,5 @@ - + + diff --git a/addons/website_membership/models/__init__.py b/addons/website_membership/models/__init__.py index 58702d876e4..08753437083 100644 --- a/addons/website_membership/models/__init__.py +++ b/addons/website_membership/models/__init__.py @@ -1 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import membership diff --git a/addons/website_membership/models/membership.py b/addons/website_membership/models/membership.py index cf62b160bf9..8e93d5f067e 100644 --- a/addons/website_membership/models/membership.py +++ b/addons/website_membership/models/membership.py @@ -1,17 +1,19 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.osv import osv, fields +from odoo import models + +class MembershipLine(models.Model): -class membership_membership_line(osv.Model): _inherit = 'membership.membership_line' - def get_published_companies(self, cr, uid, ids, limit=None, context=None): - if not ids: + def get_published_companies(self, limit=None): + if not self.ids: return [] limit_clause = '' if limit is None else ' LIMIT %d' % limit - cr.execute('SELECT DISTINCT p.id \ - FROM res_partner p INNER JOIN membership_membership_line m \ - ON p.id = m.partner \ - WHERE website_published AND is_company AND m.id IN %s ' + limit_clause, (tuple(ids),)) - return [partner_id[0] for partner_id in cr.fetchall()] + self.env.cr.execute(""" + SELECT DISTINCT p.id + FROM res_partner p INNER JOIN membership_membership_line m + ON p.id = m.partner + WHERE website_published AND is_company AND m.id IN %s """ + limit_clause, (tuple(self.ids),)) + return [partner_id[0] for partner_id in self.env.cr.fetchall()] diff --git a/addons/website_membership/security/website_membership.xml b/addons/website_membership/security/website_membership.xml index 3d354d1ebd6..bdfeb1c42df 100644 --- a/addons/website_membership/security/website_membership.xml +++ b/addons/website_membership/security/website_membership.xml @@ -1,6 +1,5 @@ - - + Product membership: Public @@ -21,5 +20,4 @@ - - + diff --git a/addons/website_membership/views/website_membership_templates.xml b/addons/website_membership/views/website_membership_templates.xml index 40e84628b2f..e4dd99612dd 100644 --- a/addons/website_membership/views/website_membership_templates.xml +++ b/addons/website_membership/views/website_membership_templates.xml @@ -1,6 +1,5 @@ - - + - - +