diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py index f6552908595..88a7ffc6551 100644 --- a/addons/website/models/ir_qweb.py +++ b/addons/website/models/ir_qweb.py @@ -341,6 +341,9 @@ class Image(orm.AbstractModel): max_size = '%sx%s' % (max_width, max_height) src = self.pool['website'].image_url(cr, uid, record, field_name, max_size) + if options.get('resize'): + src = "%s/%s" % (src, options.get('resize')) + img = '' % (classes, src, options.get('style', '')) return ir_qweb.HTMLSafe(img) diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js index b10f53257b7..7fe3b3789c6 100644 --- a/addons/website_sale/static/src/js/website_sale.editor.js +++ b/addons/website_sale/static/src/js/website_sale.editor.js @@ -42,6 +42,7 @@ $('
  • ') .append( $('').text(data[k]['name']) )); } + self.set_active(); }); this.bind_resize(); diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 550ceabdf2f..19f7eabbd1f 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -77,7 +77,7 @@
    diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index 909f5dc46b4..7138801beaf 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -476,7 +476,9 @@ class QWeb(orm.AbstractModel): record = self.eval_object(record, qwebcontext) field = record._fields[field_name] - options = json.loads(template_attributes.get('field-options') or '{}') + foptions = self.eval_format(template_attributes.get('field-options') or '{}', qwebcontext) + options = json.loads(foptions) + field_type = get_field_type(field, options) converter = self.get_converter_for(field_type)