pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] style and domain fixes

Browse Source 
bzr revid: xmo@openerp.com-20131121142839-aotrh21l5d416hu3
This commit is contained in:
Xavier Morel
2013-11-21 15:28:39 +01:00
parent 61431d0384
commit 1ce9f8539b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_membership/controllers/main.py
+6 -7
View File
@@ -27,9 +27,9 @@ class WebsiteMembership(http.Controller):
post_country_id = int(post.get('country_id', '0'))
# base domain for groupby / searches
base_line_domain = [(1, '=', 1)]
base_line_domain = []
if membership_id:
base_line_domain += [('membership_id', '=', membership_id)]
base_line_domain.append(('membership_id', '=', membership_id))
membership = product_obj.browse(cr, uid, membership_id, context=context)
else:
membership = None
@@ -41,7 +41,7 @@ class WebsiteMembership(http.Controller):
countries = partner_obj.read_group(
cr, uid, [('member_lines', 'in', membership_line_ids)], ["id", "country_id"],
groupby="country_id", orderby="country_id", context=request.context)
countries_total = sum([country_dict['country_id_count'] for country_dict in countries])
countries_total = sum(country_dict['country_id_count'] for country_dict in countries)
countries.insert(0, {
'country_id_count': countries_total,
'country_id': (0, _("All Countries"))
@@ -50,16 +50,15 @@ class WebsiteMembership(http.Controller):
# displayed membership lines
line_domain = list(base_line_domain)
if post_country_id:
line_domain += [('partner.country_id', '=', post_country_id)]
line_domain.append(('partner.country_id', '=', post_country_id))
membership_line_ids = membership_line_obj.search(cr, uid, line_domain, context=context)
membership_lines = membership_line_obj.browse(cr, uid, membership_line_ids, context=context)
partner_ids = [m.partner and m.partner.id for m in membership_lines]
google_map_partner_ids = ",".join([str(pid) for pid in partner_ids])
google_map_partner_ids = ",".join(map(str, partner_ids))
# format domain for group_by and memberships
membership_domain = [('membership', '=', True)]
membership_ids = product_obj.search(cr, uid, membership_domain, context=context)
membership_ids = product_obj.search(cr, uid, [('membership', '=', True)], context=context)
memberships = product_obj.browse(cr, uid, membership_ids, context=context)
# request pager for lines