diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py index 8916968f7ca..ad2b63a6dd9 100644 --- a/addons/website/models/ir_qweb.py +++ b/addons/website/models/ir_qweb.py @@ -383,6 +383,10 @@ class Contact(orm.AbstractModel): _name = 'website.qweb.field.contact' _inherit = ['ir.qweb.field.contact', 'website.qweb.field.many2one'] +class QwebView(orm.AbstractModel): + _name = 'website.qweb.field.qweb' + _inherit = ['ir.qweb.field.qweb'] + def html_to_text(element): """ Converts HTML content with HTML-specified line breaks (br, p, div, ...) diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index c9fadade6ed..f67f6ada4b9 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -128,8 +128,6 @@ class view(osv.osv): if isinstance(id_or_xml_id, list): id_or_xml_id = id_or_xml_id[0] - if isinstance(id_or_xml_id, (int, long)): - id_or_xml_id = self.get_view_xmlid(cr, uid, id_or_xml_id) if not context: context = {} diff --git a/addons/website/models/website.py b/addons/website/models/website.py index a516f5cb96f..8018e409f2c 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -221,10 +221,13 @@ class website(osv.osv): ) def get_template(self, cr, uid, ids, template, context=None): - if '.' not in template: - template = 'website.%s' % template - module, xmlid = template.split('.', 1) - model, view_id = request.registry["ir.model.data"].get_object_reference(cr, uid, module, xmlid) + if isinstance(template, (int, long)): + view_id = template + else: + if '.' not in template: + template = 'website.%s' % template + module, xmlid = template.split('.', 1) + model, view_id = request.registry["ir.model.data"].get_object_reference(cr, uid, module, xmlid) return self.pool["ir.ui.view"].browse(cr, uid, view_id, context=context) def _render(self, cr, uid, ids, template, values=None, context=None): diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py index bfb3c142ca1..7b0f31d1cb5 100644 --- a/addons/website_sale/models/product.py +++ b/addons/website_sale/models/product.py @@ -60,6 +60,9 @@ class product_template(osv.Model): 'website_style_ids': fields.many2many('product.style', 'product_website_style_rel', 'product_id', 'style_id', 'Styles'), 'website_sequence': fields.integer('Sequence', help="Determine the display order in the Website E-commerce"), 'website_url': fields.function(_website_url, string="Website url", type="char"), + + + 'test_ir_ui_view': fields.many2one('ir.ui.view', 'test_ir_ui_view'), } def __defaults_website_sequence(self, cr, uid, *kwargs): diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 542147a0b2e..4c546745bf2 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -301,6 +301,10 @@ + ------------------------------- +
+ ------------------------------- +
diff --git a/addons/website_sale/views/website_sale_backend.xml b/addons/website_sale/views/website_sale_backend.xml index 863c47ac565..4794d9bb877 100644 --- a/addons/website_sale/views/website_sale_backend.xml +++ b/addons/website_sale/views/website_sale_backend.xml @@ -74,6 +74,7 @@ domain="[('attribute_id', '=', attribute_id)]"/> +