diff --git a/addons/website_forum/__openerp__.py b/addons/website_forum/__openerp__.py
index 8e71054e565..a335e8fc971 100644
--- a/addons/website_forum/__openerp__.py
+++ b/addons/website_forum/__openerp__.py
@@ -29,7 +29,7 @@
Ask questions, get answers, no distractions
""",
'author': 'OpenERP SA',
- 'depends': ['website', 'website_mail', 'gamification', 'website_partner'],
+ 'depends': ['website', 'website_mail', 'gamification', 'website_partner', 'auth_signup'],
'data': [
'data/forum_data.xml',
'views/website_forum.xml',
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index b0527627b84..19f627fe14f 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -237,6 +237,10 @@ class website_forum(http.Controller):
que_ids = Post.search(cr, uid, [('id', 'in', post_ids), ('forum_id', '=', forum.id), ('parent_id', '=', False)], context=context)
followed = Post.browse(cr, uid, que_ids, context=context)
+ #showing Favourite questions of user.
+ fav_que_ids = Post.search(cr, uid, [('favourite_ids', '=', user.id), ('forum_id', '=', forum.id), ('parent_id', '=', False)], context=context)
+ 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.user_id', '=', user.id)], ["vote"], groupby=["vote"], context=context)
up_votes, down_votes = 0, 0
@@ -273,6 +277,7 @@ class website_forum(http.Controller):
'questions': user_questions,
'answers': user_answers,
'followed': followed,
+ 'favourite': favourite,
'total_votes': total_votes,
'up_votes': up_votes,
'down_votes': down_votes,
diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index be43a7b037b..0e765e0eec5 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -23,6 +23,11 @@
open
+
+ auth_signup.allow_uninvited
+
+
+
Asked a question
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 4e8ee6ff2c9..9d8cd2db5f7 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -94,9 +94,6 @@ class Post(osv.Model):
res[post.id] = len(post.child_ids)
return res
- def _get_child(self, cr, uid, ids, context=None):
- return ids
-
def _get_view_count(self, cr, uid, ids, field_name=False, arg={}, context=None):
res = dict.fromkeys(ids, 0)
for post in self.browse(cr, uid, ids, context=context):
@@ -171,7 +168,7 @@ class Post(osv.Model):
'child_ids': fields.one2many('website.forum.post', 'parent_id', 'Answers'),
'child_count':fields.function(_get_child_count, string="Answers", type='integer',
store={
- 'website.forum.post': (_get_child, [], 10),
+ 'website.forum.post': (lambda self, cr, uid, ids, c={}: ids, [], 10),
}
),
diff --git a/addons/website_forum/security/website_forum.xml b/addons/website_forum/security/website_forum.xml
index 5dd82f1d3ef..39ab3fe1ea0 100644
--- a/addons/website_forum/security/website_forum.xml
+++ b/addons/website_forum/security/website_forum.xml
@@ -6,7 +6,7 @@
res_partner: public
[]
-
+
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 8918ba8d084..ce0bd921ca4 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -763,15 +763,18 @@
Answers
+
+ Favourite Questions
+
+
+ Followed Questions
+
Activity
Badges
-
- Followed Question
-
Votes
@@ -792,6 +795,11 @@
+