diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index 160a671dfa8..03accefa4dc 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -296,13 +296,11 @@ class WebsiteBlog(http.Controller): @http.route('/blog_post/comments', type='json', auth="public", website=True) def getcomments(self, blog=None, tag_id=None, **post): - blog = request.registry.get('blog.post').browse(request.cr, SUPERUSER_ID, int(blog)) + mail_obj = request.registry.get('mail.message') values = [] - mail_obj = request.registry.get('mail.message'); - for mail in blog.website_message_ids: - ids = mail_obj.search(request.cr, SUPERUSER_ID, [('id', '=', mail.id), ('tag_id', '=', tag_id)]) - if ids: - post = mail_obj.browse(request.cr, SUPERUSER_ID, ids[0]) + ids = mail_obj.search(request.cr, SUPERUSER_ID, [('res_id', '=', int(blog)) ,('model','=','blog.post'), ('tag_id', '=', tag_id)]) + if ids: + for post in mail_obj.browse(request.cr, SUPERUSER_ID, ids): values.append({ "author_name": post.author_id.name, "date": post.date, diff --git a/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js b/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js index 180b7da680f..83464d5965d 100644 --- a/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js +++ b/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js @@ -1,13 +1,9 @@ -// Disqus global vars. +//global vars. var disqus_identifier; var disqus_url; (function($) { - - jQuery(document).ready(function() { - jQuery("main p").inlineDisqussions(); - }); - + var settings = {}; $.fn.extend({ @@ -16,8 +12,6 @@ var disqus_url; // Set up defaults var defaults = { identifier: 'name', - displayCount: true, - highlighted: false, position: 'right', background: 'white', maxWidth: 9999 @@ -42,11 +36,6 @@ var disqus_url; disqussionNotesHandler(i, $(this)); }); - // Display comments count. - if (settings.displayCount) { - // loadDisqusCounter(); - } - // Hide the discussion. $('html').click(function(event) { if($(event.target).parents('#disqussions_wrapper, .main-disqussion-link-wrp').length === 0) { @@ -153,52 +142,39 @@ var disqus_url; if(!data) return; _.map(data, function(res){ - p += '
| '+res.author_name+' | |
on '+res.date+' | |
| '+res.body+' | |