diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index f9d98b383f4..b90e9a12eda 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -162,6 +162,7 @@ class website_forum(http.Controller): Activity = request.registry['mail.message'] Data = request.registry["ir.model.data"] + #questions asked by user. question_ids = Post.search(cr, uid, [('forum_id', '=', forum.id), ('create_uid', '=', user.id), ('parent_id', '=', False)], context=context) user_questions = Post.browse(cr, uid, question_ids, context=context) @@ -170,16 +171,21 @@ class website_forum(http.Controller): user_answers = Post.browse(cr, uid, obj_ids, context=context) answers = [answer.parent_id for answer in user_answers] + #votes which given on users questions and answers. total_votes = Vote.search(cr, uid, [('post_id.forum_id', '=', forum.id), ('post_id.create_uid', '=', user.id)], count=True, context=context) up_votes = Vote.search(cr, uid, [('post_id.forum_id', '=', forum.id), ('post_id.create_uid', '=', user.id), ('vote', '=', '1')], count=True, context=context) down_votes = Vote.search(cr, uid, [('post_id.forum_id', '=', forum.id), ('post_id.create_uid', '=', user.id), ('vote', '=', '-1')], count=True, context=context) + #Votes which given by users on others questions and answers. + post_votes = Vote.search(cr, uid, [('user_id', '=', uid)], context=context) + vote_ids = Vote.browse(cr, uid, post_votes, context=context) + + #activity by user. user_post_ids = question_ids + obj_ids model, comment = Data.get_object_reference(cr, uid, 'mail', 'mt_comment') activity_ids = Activity.search(cr, uid, [('res_id', 'in', user_post_ids), ('model', '=', 'website.forum.post'), '|', ('subtype_id', '!=', comment), ('subtype_id', '=', False)], context=context) activities = Activity.browse(cr, uid, activity_ids, context=context) - posts = {} for act in activities: posts[act.res_id] = True @@ -200,7 +206,8 @@ class website_forum(http.Controller): 'up_votes': up_votes, 'down_votes': down_votes, 'activities': activities, - 'posts': posts + 'posts': posts, + 'vote_post':vote_ids, } return request.website.render("website_forum.user_detail_full", values) diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 2073623459e..5c661b58f63 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -66,7 +66,7 @@ @@ -380,7 +380,7 @@
- +
- +
- +

Karma

- +

Followed Questions

+
+ +
  • @@ -701,7 +707,7 @@
    - + X @@ -714,5 +720,21 @@
    +