From f39e5358bc6dbb93a34fb52488840eec4f16f54b Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 1 Feb 2016 10:03:18 +0100
Subject: [PATCH] [FIX] website_forum: decrease indexed pages which will return
 404

Add filter in domain converter to remove some posts in sitemap.

Avoid to add in sitemap some pages that could not be read
by public user due to a karma restriction.
---
 addons/website_forum/controllers/main.py |  3 +--
 addons/website_forum/models/forum.py     | 24 +++++++++++++++++++++++-
 openerp/osv/expression.py                |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 449ce6a758d..5d697e18e68 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -220,9 +220,8 @@ class WebsiteForum(http.Controller):
         except URLError:
             return False
 
-    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0]),('parent_id','=',False)]"):question>'''], type='http', auth="public", website=True)
+    @http.route(['''/forum/<model("forum.forum"):forum>/question/<model("forum.post", "[('forum_id','=',forum[0]),('parent_id','=',False),('can_view', '=', True)]"):question>'''], type='http', auth="public", website=True)
     def question(self, forum, question, **post):
-
         # Hide posts from abusers (negative karma), except for moderators
         if not question.can_view:
             raise werkzeug.exceptions.NotFound()
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 2f6b6d4b844..78c486a9ddc 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -265,12 +265,34 @@ class Post(models.Model):
     can_downvote = fields.Boolean('Can Downvote', compute='_get_post_karma_rights')
     can_comment = fields.Boolean('Can Comment', compute='_get_post_karma_rights')
     can_comment_convert = fields.Boolean('Can Convert to Comment', compute='_get_post_karma_rights')
-    can_view = fields.Boolean('Can View', compute='_get_post_karma_rights')
+    can_view = fields.Boolean('Can View', compute='_get_post_karma_rights', search='_search_can_view')
     can_display_biography = fields.Boolean("Is the author's biography visible from his post", compute='_get_post_karma_rights')
     can_post = fields.Boolean('Can Automatically be Validated', compute='_get_post_karma_rights')
     can_flag = fields.Boolean('Can Flag', compute='_get_post_karma_rights')
     can_moderate = fields.Boolean('Can Moderate', compute='_get_post_karma_rights')
 
+    def _search_can_view(self, operator, value):
+        if operator not in ('=', '!=', '<>'):
+            raise ValueError('Invalid operator: %s' % (operator,))
+
+        is_admin = self._uid == SUPERUSER_ID
+        if is_admin:
+            return [(1, '=', 1)]
+
+        user = self.env['res.users'].browse(self._uid)
+        req = """
+            SELECT p.id
+            FROM forum_post p
+                   LEFT JOIN res_users u ON p.create_uid = u.id
+                   LEFT JOIN forum_forum f ON p.forum_id = f.id
+            WHERE
+                u.karma > 0
+                or (p.create_uid = %s and f.karma_close_own <= %s)
+                or (p.create_uid != %s and f.karma_close_all <= %s)
+        """
+        # don't use param named because orm will add other param (test_active, ...)
+        return [('id', '%sselect' % (operator == "=" and "in" or "not in"), (req, (user.id, user.karma, user.id, user.karma)))]
+
     @api.one
     @api.depends('content')
     def _get_plain_content(self):
diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index d30b6a943cd..47b941485b2 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -907,7 +907,7 @@ class expression(object):
                     push(leaf)
                 else:
                     for elem in reversed(domain):
-                        push(create_substitution_leaf(leaf, elem, model))
+                        push(create_substitution_leaf(leaf, elem, model, internal=True))
 
             # -------------------------------------------------
             # FUNCTION FIELD