odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] website_sale: remove filter of rows process grid, layout need to create empty tr for rowspan 

bzr revid: chm@openerp.com-20140311093050-4p75rrdh5bg8mpqy
This commit is contained in:
chm@openerp.com 2014-03-11 10:30:50 +01:00
parent 86f48a1a79
commit 3353305a6f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/website_sale/controllers/main.py
View File

@ -113,9 +113,8 @@ class table_compute(object):
cols.sort()
x += len(cols)
rows[col] = [c for c in map(lambda x: x[1], cols) if c != False]
rows = filter(bool, rows)
return filter(bool, rows)
return rows
class Ecommerce(http.Controller):

2
addons/website_sale/views/website_sale.xml
View File

@ -118,7 +118,7 @@
<t t-if="td_product">
<t t-set="product" t-value="td_product['product']"/>
<td t-att-colspan="td_product['x'] != 1 and td_product['x']"
t-att-rowspan="td_product['y'] != 1 and td_product['x'] != 4 and td_product['y']"
t-att-rowspan="td_product['y'] != 1 and td_product['y']"
t-attf-class="oe_product oe_grid oe-height-#{td_product['y']*2} #{ td_product['class'] }">
<div class="oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">