diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 4fc86e751ca2dcac1efaeba47010844aa6ad187c..ea68250b9869198eb9acf008c7d655785b351c8b 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -451,16 +451,21 @@ class WebsiteForum(http.Controller):
return request.website.render("website_forum.private_profile", values)
# questions and answers by user
user_questions, user_answers = [], []
- user_post_ids = Post.search(
- cr, uid, [
+ user_question_ids = Post.search(cr, uid, [
+ ('parent_id', '=', False),
('forum_id', '=', forum.id), ('create_uid', '=', user.id),
- '|', ('active', '=', False), ('active', '=', True)], context=context)
- user_posts = Post.browse(cr, uid, user_post_ids, context=context)
- for record in user_posts:
- if record.parent_id:
- user_answers.append(record)
- else:
- user_questions.append(record)
+ ], order='create_date desc', context=context)
+ count_user_questions = len(user_question_ids)
+ # displaying only the 20 most recent questions
+ user_questions = Post.browse(cr, uid, user_question_ids[:20], context=context)
+
+ user_answer_ids = Post.search(cr, uid, [
+ ('parent_id', '!=', False),
+ ('forum_id', '=', forum.id), ('create_uid', '=', user.id),
+ ], order='create_date desc', context=context)
+ count_user_answers = len(user_answer_ids)
+ # displaying only the 20 most recent answers
+ user_answers = Post.browse(cr, uid, user_answer_ids[:20], context=context)
# showing questions which user following
obj_ids = Followers.search(cr, SUPERUSER_ID, [('res_model', '=', 'forum.post'), ('partner_id', '=', user.partner_id.id)], context=context)
@@ -473,14 +478,13 @@ class WebsiteForum(http.Controller):
favourite = Post.browse(cr, uid, fav_que_ids, context=context)
#votes which given on users questions and answers.
- data = Vote.read_group(cr, uid, [('post_id.forum_id', '=', forum.id), ('post_id.create_uid', '=', user.id)], ["vote"], groupby=["vote"], context=context)
+ data = Vote.read_group(cr, uid, [('forum_id', '=', forum.id), ('recipient_id', '=', user.id)], ["vote"], groupby=["vote"], context=context)
up_votes, down_votes = 0, 0
for rec in data:
if rec['vote'] == '1':
up_votes = rec['vote_count']
elif rec['vote'] == '-1':
down_votes = rec['vote_count']
- total_votes = up_votes + down_votes
#Votes which given by users on others questions and answers.
post_votes = Vote.search(cr, uid, [('user_id', '=', user.id)], context=context)
@@ -488,7 +492,7 @@ class WebsiteForum(http.Controller):
#activity by user.
model, comment = Data.get_object_reference(cr, uid, 'mail', 'mt_comment')
- activity_ids = Activity.search(cr, uid, [('res_id', 'in', user_post_ids), ('model', '=', 'forum.post'), ('subtype_id', '!=', comment)], order='date DESC', limit=100, context=context)
+ activity_ids = Activity.search(cr, uid, [('res_id', 'in', user_question_ids+user_answer_ids), ('model', '=', 'forum.post'), ('subtype_id', '!=', comment)], order='date DESC', limit=100, context=context)
activities = Activity.browse(cr, uid, activity_ids, context=context)
posts = {}
@@ -509,10 +513,11 @@ class WebsiteForum(http.Controller):
'main_object': user,
'searches': post,
'questions': user_questions,
+ 'count_questions': count_user_questions,
'answers': user_answers,
+ 'count_answers': count_user_answers,
'followed': followed,
'favourite': favourite,
- 'total_votes': total_votes,
'up_votes': up_votes,
'down_votes': down_votes,
'activities': activities,
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index fc4db96685b7f4f44c2a33dbfeed4b4b25370760..b39298a5921849df17de1d95e0c4c9a8d3a72185 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -526,6 +526,10 @@ class Vote(osv.Model):
'user_id': fields.many2one('res.users', 'User', required=True),
'vote': fields.selection([('1', '1'), ('-1', '-1'), ('0', '0')], 'Vote', required=True),
'create_date': fields.datetime('Create Date', select=True, readonly=True),
+
+ # TODO master: store these two
+ 'forum_id': fields.related('post_id', 'forum_id', type='many2one', relation='forum.forum', string='Forum'),
+ 'recipient_id': fields.related('post_id', 'create_uid', type='many2one', relation='res.users', string='To', help="The user receiving the vote"),
}
_defaults = {
'user_id': lambda self, cr, uid, ctx: uid,
@@ -544,20 +548,20 @@ class Vote(osv.Model):
vote_id = super(Vote, self).create(cr, uid, vals, context=context)
vote = self.browse(cr, uid, vote_id, context=context)
if vote.post_id.parent_id:
- karma_value = self._get_karma_value('0', vote.vote, vote.post_id.forum_id.karma_gen_answer_upvote, vote.post_id.forum_id.karma_gen_answer_downvote)
+ karma_value = self._get_karma_value('0', vote.vote, vote.forum_id.karma_gen_answer_upvote, vote.forum_id.karma_gen_answer_downvote)
else:
- karma_value = self._get_karma_value('0', vote.vote, vote.post_id.forum_id.karma_gen_question_upvote, vote.post_id.forum_id.karma_gen_question_downvote)
- self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [vote.post_id.create_uid.id], karma_value, context=context)
+ karma_value = self._get_karma_value('0', vote.vote, vote.forum_id.karma_gen_question_upvote, vote.forum_id.karma_gen_question_downvote)
+ self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [vote.recipient_id.id], karma_value, context=context)
return vote_id
def write(self, cr, uid, ids, values, context=None):
if 'vote' in values:
for vote in self.browse(cr, uid, ids, context=context):
if vote.post_id.parent_id:
- karma_value = self._get_karma_value(vote.vote, values['vote'], vote.post_id.forum_id.karma_gen_answer_upvote, vote.post_id.forum_id.karma_gen_answer_downvote)
+ karma_value = self._get_karma_value(vote.vote, values['vote'], vote.forum_id.karma_gen_answer_upvote, vote.forum_id.karma_gen_answer_downvote)
else:
- karma_value = self._get_karma_value(vote.vote, values['vote'], vote.post_id.forum_id.karma_gen_question_upvote, vote.post_id.forum_id.karma_gen_question_downvote)
- self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [vote.post_id.create_uid.id], karma_value, context=context)
+ karma_value = self._get_karma_value(vote.vote, values['vote'], vote.forum_id.karma_gen_question_upvote, vote.forum_id.karma_gen_question_downvote)
+ self.pool['res.users'].add_karma(cr, SUPERUSER_ID, [vote.recipient_id.id], karma_value, context=context)
res = super(Vote, self).write(cr, uid, ids, values, context=context)
return res
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 476e7bc1ec00ebdac58992cd4f48e88ba0aac96c..48a0f9bf9592d6c15e36f3cd075a66147e533c73 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -963,10 +963,10 @@
<ul class="nav nav-tabs">
<li class="active">
- <a href="#questions" data-toggle="tab"><t t-esc="len(questions)"/> Questions</a>
+ <a href="#questions" data-toggle="tab"><t t-esc="count_questions"/> Questions</a>
</li>
<li>
- <a href="#answers" data-toggle="tab"><t t-esc="len(answers)"/> Answers</a>
+ <a href="#answers" data-toggle="tab"><t t-esc="count_answers"/> Answers</a>
</li>
<li t-if="uid == user.id">
<a href="#favourite_question" data-toggle="tab"><t t-esc="len(favourite)"/> Favourite Questions</a>
@@ -1000,20 +1000,20 @@
<div class="tab-pane" id="badges">
<t t-call="website_forum.user_badges"/>
</div>
- <div class="tab-pane" id="favourite_question">
+ <div class="tab-pane" id="favourite_question" t-if="uid == user.id">
<div t-foreach="favourite" t-as="question">
<t t-call="website_forum.display_post"/>
</div>
</div>
- <div class="tab-pane" id="followed_question">
+ <div class="tab-pane" id="followed_question" t-if="uid == user.id">
<div t-foreach="followed" t-as="question" class="mb16">
<t t-call="website_forum.display_post"/>
</div>
</div>
- <div class="tab-pane" id="votes">
+ <div class="tab-pane" id="votes" t-if="uid == user.id">
<t t-call="website_forum.user_votes"/>
</div>
- <div class="tab-pane" id="activity">
+ <div class="tab-pane" id="activity" t-if="uid == user.id">
<ul class="list-unstyled">
<li t-foreach="activities" t-as="activity">
<span t-field="activity.date" t-field-options='{"format": "short"}'/>