diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index 69a420be320..23a7b9ad538 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -96,7 +96,7 @@ class WebsiteForum(http.Controller): Post = request.registry['forum.post'] user = request.registry['res.users'].browse(cr, uid, uid, context=context) - domain = [('forum_id', '=', forum.id), ('parent_id', '=', False)] + domain = [('forum_id', '=', forum.id), ('parent_id', '=', False), ('state', '=', 'active')] if search: domain += ['|', ('name', 'ilike', search), ('content', 'ilike', search)] if tag: @@ -123,7 +123,7 @@ class WebsiteForum(http.Controller): url = "/forum/%s/%s/questions" % (slug(forum), slug(tag)) else: url = "/forum/%s" % slug(forum) - + url_args = {} if search: url_args['search'] = search @@ -535,7 +535,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)], context=context) + 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) activities = Activity.browse(cr, uid, activity_ids, context=context) posts = {} diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 66b13026335..0f132c48420 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -434,16 +434,18 @@ [Deleted] [Closed] -
-

- The question has been closed for reason: -
- - by - - on
+

+

+ The question has been closed for reason:

-