From d51ebda9fc687e07821a732f2fcefc5829710ac2 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 13 Jan 2014 09:23:41 +0100 Subject: [PATCH 01/25] [FIX] decimal.precision: add access right for decimal_precision_test bzr revid: chm@openerp.com-20140113082341-u13c2oc3c0xev8ar --- addons/decimal_precision/security/ir.model.access.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/decimal_precision/security/ir.model.access.csv b/addons/decimal_precision/security/ir.model.access.csv index aa203eae141..d55da432c57 100644 --- a/addons/decimal_precision/security/ir.model.access.csv +++ b/addons/decimal_precision/security/ir.model.access.csv @@ -1,3 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_decimal_precision_config,decimal.precision configuration,model_decimal_precision,base.group_system,1,1,1,1 access_decimal_precision_all,decimal.precision,model_decimal_precision,,1,0,0,0 +access_decimal_precision_test_all,decimal.precision.test,model_decimal_precision_test,,1,1,1,1 From b1a422a9dc935749d309715843f7ce764551f195 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 13 Jan 2014 09:32:46 +0100 Subject: [PATCH 02/25] [FIX] event_sale: demo data bzr revid: chm@openerp.com-20140113083246-qypjeukv1kf5rrjf --- addons/event_sale/event_demo.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml index fabaad18ee4..3ca61d3feb4 100644 --- a/addons/event_sale/event_demo.xml +++ b/addons/event_sale/event_demo.xml @@ -74,8 +74,6 @@ 1500.0 10 - Cathering for breakfast and lunch -VIP Parking access @@ -105,8 +103,6 @@ VIP Parking access 1500.0 5 - Cathering for breakfast and lunch -VIP Parking access @@ -125,8 +121,6 @@ VIP Parking access 1500.0 5 - Cathering for breakfast and lunch -VIP Parking access From 2d2d047a616cbd0aec6946355ed290a2df02e7a2 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 13 Jan 2014 09:38:46 +0100 Subject: [PATCH 03/25] [FIX] payment_aquirer_paypal: remove wrong field paypal_tx_url in demo data bzr revid: chm@openerp.com-20140113083846-6z0t1iazvi2an5s5 --- addons/payment_acquirer_paypal/data/paypal.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/payment_acquirer_paypal/data/paypal.xml b/addons/payment_acquirer_paypal/data/paypal.xml index 55245804975..d764c20edbd 100644 --- a/addons/payment_acquirer_paypal/data/paypal.xml +++ b/addons/payment_acquirer_paypal/data/paypal.xml @@ -8,7 +8,6 @@ test You will be redirected to the Paypal website after cliking on the payment button.

]]> - https://www.sandbox.paypal.com/cgi-bin/webscr dummy dummy dummy From f927506bfcb41819372d5713294a805d5d2a4381 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 13 Jan 2014 12:05:42 +0100 Subject: [PATCH 04/25] [FIX] website_mail: follow/subscribe button bzr revid: chm@openerp.com-20140113110542-jkb13xfiy3tno50n --- addons/website_mail/controllers/main.py | 5 +++-- .../website_mail/static/src/js/website_mail.js | 18 ++++++++---------- addons/website_mail/views/website_mail.xml | 9 ++++----- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py index 88bf93fbda4..ea0befff81a 100644 --- a/addons/website_mail/controllers/main.py +++ b/addons/website_mail/controllers/main.py @@ -35,7 +35,7 @@ class WebsiteMail(http.Controller): if email and email != u'false': # post contains stringified booleans partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", email)], context=request.context) if not partner_ids: - partner_ids = [partner_obj.name_create(request.cr, SUPERUSER_ID, email, request.context)] + partner_ids = [partner_obj.name_create(request.cr, SUPERUSER_ID, email, request.context)[0]] else: partner_ids = [user_obj.browse(request.cr, request.uid, request.uid, request.context).partner_id.id] return partner_ids @@ -54,5 +54,6 @@ class WebsiteMail(http.Controller): _object.check_access_rule(request.cr, request.uid, [_id], 'read', request.context) _object.message_subscribe(request.cr, SUPERUSER_ID, [_id], partner_ids, context=request.context) obj = _object.browse(request.cr, request.uid, _id) + follower_ids = [p.id for p in obj.message_follower_ids] - return obj.message_is_follower and 1 or 0 + return partner_ids[0] in follower_ids and 1 or 0 diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js index cfd3e16d1ec..99acd3f939b 100644 --- a/addons/website_mail/static/src/js/website_mail.js +++ b/addons/website_mail/static/src/js/website_mail.js @@ -1,12 +1,12 @@ $(document).ready(function () { - $(document).on('click', '.js_follow_btn', function (ev) { + $(document).on('click', '.js_follow_btn, .js_unfollow_btn', function (ev) { ev.preventDefault(); - var self = this; + var self = this; var $data = $(this).parents("div.js_follow"); - var $email = $(".js_follow_email", $data); - var message_is_follower = $data.attr("data-follow"); + var $email = $data.find(".js_follow_email"); + var message_is_follower = $data.attr("data-follow") || "off"; $data.attr("data-follow", message_is_follower == 'off' ? 'on' : 'off'); openerp.jsonRpc('/website_mail/follow', 'call', { @@ -15,12 +15,10 @@ $(document).ready(function () { 'message_is_follower': message_is_follower, 'email': $email && $email.val() || false, }).then(function (result) { - if (result) { - $data.html('
Thanks for your subscription!
') - } else { - $data.attr("data-follow", + result ? 'on' : 'off'); - $(self).text('Subscribe') - } + if (result) { + $data.find(" > *").toggleClass("hidden"); + } + $data.attr("data-follow", result ? 'on' : 'off'); }); }); diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml index 2a2253794f3..244ac4b28c2 100644 --- a/addons/website_mail/views/website_mail.xml +++ b/addons/website_mail/views/website_mail.xml @@ -12,18 +12,17 @@ t-att-value="email or ''" placeholder="your email..."/> - + + + From f319a68196212af860038e7ebfbfa3d9c492718f Mon Sep 17 00:00:00 2001 From: "ddm@openerp.com" <> Date: Mon, 13 Jan 2014 12:25:14 +0100 Subject: [PATCH 05/25] [IMP] requestd by fp: load correct HTML template bzr revid: ddm@openerp.com-20140113112514-qg43scqeryaha4nf --- addons/website/static/src/js/website.ace.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js index f3b8a5c5885..4ff5aa44146 100644 --- a/addons/website/static/src/js/website.ace.js +++ b/addons/website/static/src/js/website.ace.js @@ -94,6 +94,11 @@ }).then(function (views) { self.loadViews.call(self, views); self.open.call(self); + // cf. fp's direct request + if (views.length >= 2) { + var mainTemplate = views[1]; + self.$('#ace-view-list').val(mainTemplate.id).trigger('change'); + } }); var $editor = self.$('.ace_editor'); From cf15dfb490205202ca7f2a78caeea0f2880ca1ad Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 13 Jan 2014 16:08:59 +0100 Subject: [PATCH 06/25] [FIX] website_blog: Customize: Author bzr revid: chm@openerp.com-20140113150859-cmj22j72syvosmmg --- addons/website_blog/views/website_blog_templates.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index e3ee875d143..6b7a54d7066 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -133,7 +133,7 @@ From 74c9840476925e106510d6868b03bd9d968e2c11 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 13 Jan 2014 16:17:08 +0100 Subject: [PATCH 07/25] [FIX] website_blog: Customize: Authors bzr revid: chm@openerp.com-20140113151708-gyii0v2gg3ljxwcp --- addons/website_blog/views/website_blog_templates.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 6b7a54d7066..958c33a3d09 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -182,7 +182,7 @@

- &nbsp; + &nbsp; With comment @@ -236,7 +236,7 @@ From 9987b9a8581449eb280f1ca8b0dcbff3bd689abd Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 13 Jan 2014 16:20:38 +0100 Subject: [PATCH 08/25] [FIX] website_blog: Customize: Blog Category bzr revid: chm@openerp.com-20140113152038-rrc3x3sfcjoppvvk --- addons/website_blog/views/website_blog_templates.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 958c33a3d09..4fe512381a4 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -244,7 +244,7 @@ From 449a37dc0d4aa3e56817d240ff0c18a76be553b8 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 14 Jan 2014 10:36:03 +0100 Subject: [PATCH 09/25] [FIX] website: base_language_install is an osv.osv_memory insead of osv.osv bzr revid: chm@openerp.com-20140114093603-toryzflx3b0yzdyr --- addons/website/models/website.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 611b582d9ce..ccdfe449617 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -624,7 +624,7 @@ class res_company(osv.osv): partner = self.browse(cr, openerp.SUPERUSER_ID, ids[0], context=context).partner_id return partner and partner.google_map_link(zoom, context=context) or None -class base_language_install(osv.osv): +class base_language_install(osv.osv_memory): _inherit = "base.language.install" _columns = { 'website_ids': fields.many2many('website', string='Websites to translate'), From 057184bb64f6ce4dbc9735760d005fe0bf3d9bef Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 14 Jan 2014 10:57:21 +0100 Subject: [PATCH 10/25] [FIX] website_sale: if I add a suggested product to the card: Page not found wrong url bzr revid: chm@openerp.com-20140114095721-xjj4keju12znfoky --- addons/website_sale/views/website_sale.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index c74b71f06d2..bc9695cda39 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -678,7 +678,7 @@ }'/> - Add to Cart + Add to Cart From c3cc2b08f1b563e4e883d95e6cc89c81633218f1 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 14 Jan 2014 11:57:44 +0100 Subject: [PATCH 11/25] [IMP] website_sale: demo data for suggested product bzr revid: chm@openerp.com-20140114105744-gz1z4ap9zra33s11 --- addons/website_sale/data/website_sale_demo.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/website_sale/data/website_sale_demo.xml b/addons/website_sale/data/website_sale_demo.xml index c16690f763d..d28a587603d 100644 --- a/addons/website_sale/data/website_sale_demo.xml +++ b/addons/website_sale/data/website_sale_demo.xml @@ -536,6 +536,7 @@ Weight: 1.1 ounces + From fbb74096e3c83449b7a382b1c89799d1f779160c Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 14 Jan 2014 11:58:02 +0100 Subject: [PATCH 12/25] [FIX] website_blog: employee can't post a comment bzr revid: chm@openerp.com-20140114105802-ztc2d398zuz100z0 --- addons/website_blog/controllers/main.py | 24 ++++++++++++------- .../views/website_blog_templates.xml | 6 ++--- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index 00835d133ab..fc48266cc5e 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -23,6 +23,7 @@ from openerp.addons.web import http from openerp.addons.web.http import request from openerp.addons.website.models import website from openerp.tools.translate import _ +from openerp import SUPERUSER_ID import werkzeug @@ -218,16 +219,23 @@ class WebsiteBlog(http.Controller): } return request.website.render("website_blog.blog_post_complete", values) - @website.route(['/blogpost//comment'], type='http', auth="public") - def blog_post_comment(self, blog_post_id, **post): + @website.route(['/blogpost/comment'], type='http', auth="public", methods=['POST']) + def blog_post_comment(self, blog_post_id=0, **post): cr, uid, context = request.cr, request.uid, request.context if post.get('comment'): - request.registry['blog.post'].message_post( - cr, uid, blog_post_id, - body=post.get('comment'), - type='comment', - subtype='mt_comment', - context=dict(context, mail_create_nosubcribe=True)) + user = request.registry['res.users'].browse(cr, SUPERUSER_ID, uid, context=context) + group_ids = user.groups_id + group_id = request.registry["ir.model.data"].get_object_reference(cr, uid, 'website_mail', 'group_comment')[1] + if group_id in [group.id for group in group_ids]: + blog_post = request.registry['blog.post'] + blog_post.check_access_rights(cr, uid, 'read') + blog_post.message_post( + cr, SUPERUSER_ID, int(blog_post_id), + body=post.get('comment'), + type='comment', + subtype='mt_comment', + author_id=user.partner_id.id, + context=dict(context, mail_create_nosubcribe=True)) return werkzeug.utils.redirect(request.httprequest.referrer + "#comments") @website.route('/blogpost/new', type='http', auth="public", multilang=True) diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 4fe512381a4..a3afdcbfd83 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -218,10 +218,10 @@