diff --git a/addons/website_customer/models/website_customer.py b/addons/website_customer/models/website_customer.py index f248ecdf56a..f84905e25c5 100644 --- a/addons/website_customer/models/website_customer.py +++ b/addons/website_customer/models/website_customer.py @@ -14,6 +14,7 @@ class res_partner(osv.Model): class res_partner_tags(osv.Model): _description = 'Partner Tags - These tags can be used on website to find customers by sector, or ... ' _name = 'res.partner.tag' + _inherit = 'website.published.mixin' def get_selection_class(self, cr, uid, context=None): classname = ['default', 'primary', 'success', 'warning', 'danger'] @@ -23,7 +24,6 @@ class res_partner_tags(osv.Model): 'name': fields.char('Category Name', required=True, translate=True), 'partner_ids': fields.many2many('res.partner', 'res_partner_res_partner_tag_rel', id1='tag_id', id2='partner_id', string='Partners'), 'classname': fields.selection(get_selection_class, 'Class', help="Bootstrap class to customize the color of the tag", required=True), - 'website_published': fields.boolean('Publish', help="The publish field allows you to show the tag on website."), 'active': fields.boolean('Active'), } _defaults = { diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py index 553df76a472..04a944774a6 100644 --- a/addons/website_event/models/event.py +++ b/addons/website_event/models/event.py @@ -1,14 +1,9 @@ # -*- coding: utf-8 -*- -from openerp import models, fields, api, _ - -# from openerp.osv import osv, fields -from openerp import SUPERUSER_ID -from openerp.models import NewId - -# from openerp.tools.translate import _ import re +from openerp import models, fields, api, _ +from openerp import SUPERUSER_ID from openerp.addons.website.models.website import slug diff --git a/addons/website_livechat/models/im_livechat.py b/addons/website_livechat/models/im_livechat.py index 805858eddf3..91cc458cceb 100644 --- a/addons/website_livechat/models/im_livechat.py +++ b/addons/website_livechat/models/im_livechat.py @@ -3,8 +3,7 @@ from openerp import models, fields class im_livechat_channel(models.Model): + _name = 'im_livechat.channel' + _inherit = ['im_livechat.channel', 'website.published.mixin'] - _inherit = 'im_livechat.channel' - - website_published = fields.Boolean("Website published", default=False, help="If checked, the channel and its ratings will be display on your website") website_description = fields.Html("Website description", default=False, help="Description of the channel displayed on the website page") diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py index 2fbe081d768..d9821d1391c 100644 --- a/addons/website_sale_delivery/models/sale_order.py +++ b/addons/website_sale_delivery/models/sale_order.py @@ -6,9 +6,10 @@ from openerp.addons import decimal_precision class delivery_carrier(orm.Model): - _inherit = 'delivery.carrier' + _name = 'delivery.carrier' + _inherit = ['delivery.carrier', 'website.published.mixin'] + _columns = { - 'website_published': fields.boolean('Available in the website', copy=False), 'website_description': fields.text('Description for the website'), } _defaults = { diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py index dc2907ec0a9..e567bdf93c0 100644 --- a/addons/website_slides/controllers/main.py +++ b/addons/website_slides/controllers/main.py @@ -260,7 +260,7 @@ class website_slides(http.Controller): return { 'img_src': '/website/image/slide.slide/%s/image_thumb' % (slide.id), 'caption': slide.name, - 'url': slide.share_url + 'url': slide.website_url } vals = map(slide_mapped_dict, slide.get_related_slides(slides_to_suggest)) add_more_slide = slides_to_suggest - len(vals) diff --git a/addons/website_slides/data/website_slides_data.xml b/addons/website_slides/data/website_slides_data.xml index 399a6a76e6d..04372a644e4 100644 --- a/addons/website_slides/data/website_slides_data.xml +++ b/addons/website_slides/data/website_slides_data.xml @@ -42,12 +42,12 @@
Published on ${object.write_date}
- +| - View in browser | + View in browser | Contact |
|
-
+
Published on ${object.write_date} - + |
| - View in browser | + View in browser | Contact |