[FIX] website_membership: membership displayed order depending on website_sequence
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
This commit is contained in:
parent
c4e48e2388
commit
255fe082bd
|
@ -37,7 +37,7 @@ class WebsiteMembership(http.Controller):
|
||||||
post_name = post.get('name', '')
|
post_name = post.get('name', '')
|
||||||
|
|
||||||
# base domain for groupby / searches
|
# base domain for groupby / searches
|
||||||
base_line_domain = []
|
base_line_domain = [('state', 'in', ['free', 'paid'])]
|
||||||
if membership_id:
|
if membership_id:
|
||||||
base_line_domain.append(('membership_id', '=', membership_id))
|
base_line_domain.append(('membership_id', '=', membership_id))
|
||||||
membership = product_obj.browse(cr, uid, membership_id, context=context)
|
membership = product_obj.browse(cr, uid, membership_id, context=context)
|
||||||
|
@ -65,6 +65,7 @@ class WebsiteMembership(http.Controller):
|
||||||
|
|
||||||
membership_line_ids = membership_line_obj.search(cr, uid, line_domain, context=context)
|
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)
|
membership_lines = membership_line_obj.browse(cr, uid, membership_line_ids, context=context)
|
||||||
|
membership_lines.sort(key=lambda x: x.membership_id.website_sequence)
|
||||||
partner_ids = [m.partner and m.partner.id for m in membership_lines]
|
partner_ids = [m.partner and m.partner.id for m in membership_lines]
|
||||||
google_map_partner_ids = ",".join(map(str, partner_ids))
|
google_map_partner_ids = ",".join(map(str, partner_ids))
|
||||||
|
|
||||||
|
@ -73,7 +74,7 @@ class WebsiteMembership(http.Controller):
|
||||||
partners_data[partner.get("id")] = partner
|
partners_data[partner.get("id")] = partner
|
||||||
|
|
||||||
# format domain for group_by and memberships
|
# format domain for group_by and memberships
|
||||||
membership_ids = product_obj.search(cr, uid, [('membership', '=', True)], context=context)
|
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_obj.browse(cr, uid, membership_ids, context=context)
|
||||||
|
|
||||||
# request pager for lines
|
# request pager for lines
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
<group name="website" string="Website">
|
<group name="website" string="Website">
|
||||||
<field name="suggested_product_ids" widget="many2many_tags"/>
|
<field name="suggested_product_ids" widget="many2many_tags"/>
|
||||||
<field name="website_style_ids" widget="many2many_tags"/>
|
<field name="website_style_ids" widget="many2many_tags"/>
|
||||||
|
<field name="website_sequence"/>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
</field>
|
</field>
|
||||||
|
|
Loading…
Reference in New Issue