From f51a366ea739d376caf0f657ff6d8c61969ba7d1 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 23 Mar 2014 20:55:31 +0100 Subject: [PATCH] [IMP] anonymous for website_blog bzr revid: fp@tinyerp.com-20140323195531-84hnzo5f950r4eg7 --- addons/mail/mail_message.py | 5 ++-- addons/website_blog/controllers/main.py | 22 +++++++++++------- .../website_blog/static/src/img/anonymous.png | Bin 0 -> 1586 bytes .../src/js/website_blog.inline.discussion.js | 2 +- .../xml/website_blog.inline.discussion.xml | 7 ++++-- .../views/website_blog_templates.xml | 12 +++++----- 6 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 addons/website_blog/static/src/img/anonymous.png diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 4c05d7a6d1f..edb8c0c48e9 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -205,7 +205,7 @@ class mail_message(osv.Model): return '%s <%s@%s>' % (this.name, this.alias_name, this.alias_domain) elif this.email: return '%s <%s>' % (this.name, this.email) - raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias.")) + return False def _get_default_author(self, cr, uid, context=None): return self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id @@ -843,7 +843,8 @@ class mail_message(osv.Model): values['reply_to'] = self._get_reply_to(cr, uid, values, context=context) newid = super(mail_message, self).create(cr, uid, values, context) - self._notify(cr, uid, newid, context=context, + if values['email_from']: + self._notify(cr, uid, newid, context=context, force_send=context.get('mail_notify_force_send', True), user_signature=context.get('mail_notify_user_signature', True)) # TDE FIXME: handle default_starred. Why not setting an inv on starred ? diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index bfa65b9674c..c1e65e2a518 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -210,11 +210,11 @@ class WebsiteBlog(http.Controller): cr, uid, context = request.cr, request.uid, request.context blog_post = request.registry['blog.post'] message_id = blog_post.message_post( - cr, uid, int(blog_post_id), + cr, SUPERUSER_ID, int(blog_post_id), body=post.get('comment'), type='comment', subtype='mt_comment', - author_id= user.partner_id.id, + author_id=False, discussion=post.get('discussion'), context=dict(context, mail_create_nosubcribe=True)) return message_id @@ -237,12 +237,14 @@ class WebsiteBlog(http.Controller): user = request.registry['res.users'].browse(cr, uid, uid, context=context) id = self._blog_post_message(user, blog_post_id, **post) mail_obj = request.registry.get('mail.message') - post = mail_obj.browse(cr, uid, id) + post = mail_obj.browse(cr, SUPERUSER_ID, id) values = { - "author_name": post.author_id.name, + "author_name": post.author_id and post.author_id.name or _('Anonymous'), "date": post.date, "body": html2plaintext(post.body), - "author_image": "data:image/png;base64,%s" % post.author_id.image, + "author_image": post.author_id and \ + ("data:image/png;base64,%s" % post.author_id.image) or \ + '/website_blog/static/src/img/anonymous.png', } return values @@ -278,14 +280,16 @@ class WebsiteBlog(http.Controller): cr, uid, context = request.cr, request.uid, request.context mail_obj = request.registry.get('mail.message') values = [] - ids = mail_obj.search(cr, uid, [('res_id', '=', int(post_id)) ,('model','=','blog.post'), ('discussion', '=', discussion)]) + ids = mail_obj.search(cr, SUPERUSER_ID, [('res_id', '=', int(post_id)) ,('model','=','blog.post'), ('discussion', '=', discussion)]) if ids: - for post in mail_obj.browse(cr, uid, ids, context=context): + for post in mail_obj.browse(cr, SUPERUSER_ID, ids, context=context): values.append({ - "author_name": post.author_id.name, + "author_name": post.author_id and post.author_id.name or _('Anonymous'), + "author_image": post.author_id and \ + ("data:image/png;base64,%s" % post.author_id.image) or \ + '/website_blog/static/src/img/anonymous.png', "date": post.date, 'body': html2plaintext(post.body), - 'author_image': "data:image/png;base64,%s" % post.author_id.image, }) return values diff --git a/addons/website_blog/static/src/img/anonymous.png b/addons/website_blog/static/src/img/anonymous.png new file mode 100644 index 0000000000000000000000000000000000000000..6461bf735f19efa7cbf6a59e4f5c08de5d60ed03 GIT binary patch literal 1586 zcmV-22F>}2P)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(H({s8{#7}SCQ000SaNLh0L01FcU01FcV0GgZ_000Fi zNkl0P1AUYnH#lc2f(nDsy&o)-{@%mxZ_xIMN8AYgHN2g0MGNC zS&g-?X49$H4I%0PKr=&Y4W%`-W+MubA%P&%d@~-UAJ2 zsH@qSO{d;4O{0zkfe4_|k{P81)DzL06`9nI)yo&5?PT}egEN^lI?nWF9mm>c8e#?! zK?ng70z?EN8rO^gt=VD5j-$uB9#m4_Jvi++sH)7)Hx03hh(L&8Lg|cctQ*SL}WAb!_~PA(&<$B;J*I9&~RT3 zn7N4=meQOQQfY8JIR52?OdtrN*%vPl8?INJ5^PTOU}jAYxr!`;aIiiuo^gpwSt?yp zK#wZ`Kq@sm@4Bf-MsC^Qrn&dyM0YO{p;BoLNQ@OyNn))vl$xA9z+jDZCY>@Bk$T(xrzp*^q7=4gJU(~m~~vqhAC!NWKvZ^i0fs8&-V5sUnp9Sv@})6089Y$ zgaYF+6X7ItrF3n7gn-gohEa4ajAXoLlf5&!nkOtmGo)0IQu;(xG!3JC zshbziL2u81AB6IEKM0?;%y<$`$ei4ipg`3PKFwjx#ZhnB;kj_p(AY_`NsO0<%5X`ML)pE)%?kV>vu+xL?mSl zD~-~g<`^!eg71g@uInGDud6{rT}}C50C2qk>({Or&AY|@#UO-M8d~WI#iYTBc_^h2 z1R=ble`sK6q&p0wq%Q6PykqMI{M6Qgf?ND1U+^wSRkBM=FbsxP8bKuCdj5#(`Jc{e zs12pMhb934mStkkcZbjTLHLR56}8sMo=)IOX#`OO*Y)7}!RNMZ{X#_8zGcI-^WM=3 zX{L z)8tszO2ZUSfO)f2s`5s@fMPKOGb5F>R_qw73Ywk$x`xj)x9mbKHe zjP+pHlTRAsw#bQB@~xV!Z literal 0 HcmV?d00001 diff --git a/addons/website_blog/static/src/js/website_blog.inline.discussion.js b/addons/website_blog/static/src/js/website_blog.inline.discussion.js index 1e92fd5a338..bed198efad7 100644 --- a/addons/website_blog/static/src/js/website_blog.inline.discussion.js +++ b/addons/website_blog/static/src/js/website_blog.inline.discussion.js @@ -13,7 +13,7 @@ var defaults = { identifier: 'name', position: 'right', - post_id: $('#blog_post_name').attr('data-oe-id'), + post_id: $('#blog_post_name').attr('data-blog-id'), content : false, }; self.settings = $.extend({}, defaults, options); diff --git a/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml b/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml index cebba5ea477..e44b4b0a0d7 100644 --- a/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml +++ b/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml @@ -6,8 +6,11 @@
-
+ + by + +
@@ -16,7 +19,7 @@