From 75203e18c1c5b772d7b4887de7d611db30da30db Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Feb 2015 22:27:54 +0100
Subject: [PATCH] [FIX] fix and improvements on rating system

---
 addons/rating_project/models/project.py                  | 9 +--------
 addons/rating_project/views/project_view.xml             | 5 ++++-
 addons/rating_project_issue/models/project_issue.py      | 5 -----
 addons/rating_project_issue/views/project_issue_view.xml | 2 +-
 addons/website_rating_project_issue/controllers/main.py  | 2 +-
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/addons/rating_project/models/project.py b/addons/rating_project/models/project.py
index e1f24ce6381..d2f08cc46cc 100644
--- a/addons/rating_project/models/project.py
+++ b/addons/rating_project/models/project.py
@@ -48,18 +48,11 @@ class Project(models.Model):
         activity = self.tasks.rating_get_grades()
         self.percentage_satisfaction_task = activity['great'] * 100 / sum(activity.values()) if sum(activity.values()) else -1
 
-    @api.one
-    @api.depends('use_tasks')
-    def _display_happy_customer(self):
-        self.is_visible_happy_customer = self.use_tasks
-
-
     percentage_satisfaction_task = fields.Integer(
         compute='_compute_percentage_satisfaction_task', string='% Happy', store=True, default=-1)
     percentage_satisfaction_project = fields.Integer(
         compute="_compute_percentage_satisfaction_project", string="% Happy", store=True, default=-1)
-    is_visible_happy_customer = fields.Boolean(
-        compute="_display_happy_customer", string="Is Visible", store=True, default=True)
+    is_visible_happy_customer = fields.Boolean(string="Customer Satisfaction", default=False)
 
 
     @api.multi
diff --git a/addons/rating_project/views/project_view.xml b/addons/rating_project/views/project_view.xml
index 897a6379878..17d32a97030 100644
--- a/addons/rating_project/views/project_view.xml
+++ b/addons/rating_project/views/project_view.xml
@@ -10,13 +10,16 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="action_view_task_rating"
-                        attrs="{'invisible': ['|', ('use_tasks','=', False), ('percentage_satisfaction_task','=', -1)]}"
+                        attrs="{'invisible': ['|', ('use_issues','=', False), ('is_visible_happy_customer','=', False)]}"
                         class="oe_stat_button oe_percent"
                         type="object"
                         icon="fa-smile-o">
                         <field string="On tasks" name="percentage_satisfaction_task" widget="statinfo"/>
                     </button>
                 </xpath>
+                <xpath expr="//field[@name='privacy_visibility']" position="after">
+                    <field name="is_visible_happy_customer"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/rating_project_issue/models/project_issue.py b/addons/rating_project_issue/models/project_issue.py
index 3b4506d9172..339027d74d7 100644
--- a/addons/rating_project_issue/models/project_issue.py
+++ b/addons/rating_project_issue/models/project_issue.py
@@ -65,11 +65,6 @@ class Project(models.Model):
         activity = project_issue.rating_get_grades()
         self.percentage_satisfaction_issue = activity['great'] * 100 / sum(activity.values()) if sum(activity.values()) else -1
 
-    @api.one
-    @api.depends('use_tasks', 'use_issues')
-    def _display_happy_customer(self):
-        self.is_visible_happy_customer = self.use_tasks if self.use_tasks else self.use_issues
-
     percentage_satisfaction_issue = fields.Integer(compute='_compute_percentage_satisfaction_issue', string='% Happy', store=True, default=-1)
 
     @api.multi
diff --git a/addons/rating_project_issue/views/project_issue_view.xml b/addons/rating_project_issue/views/project_issue_view.xml
index bc8495f5687..2f44dc0c17a 100644
--- a/addons/rating_project_issue/views/project_issue_view.xml
+++ b/addons/rating_project_issue/views/project_issue_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="action_view_issue_rating"
-                        attrs="{'invisible': ['|', ('use_issues','=', False), ('percentage_satisfaction_issue','=', -1)]}"
+                        attrs="{'invisible': ['|', ('use_issues','=', False), ('is_visible_happy_customer','=', False)]}"
                         class="oe_stat_button oe_percent"
                         type="object"
                         icon="fa-smile-o">
diff --git a/addons/website_rating_project_issue/controllers/main.py b/addons/website_rating_project_issue/controllers/main.py
index c076bdb5b7e..58cfad5f6fd 100644
--- a/addons/website_rating_project_issue/controllers/main.py
+++ b/addons/website_rating_project_issue/controllers/main.py
@@ -13,7 +13,7 @@ class WebsiteRatingProject(http.Controller):
         values = {'projects' : projects}
         return request.website.render('website_rating_project_issue.index', values)
 
-    @http.route(['/project/rating/<model("project.project"):project>'], type='http', auth="public", website=True)
+    @http.route(['''/project/rating/<model("project.project", "[('is_visible_happy_customer','=',1)]"):project>'''], type='http', auth="public", website=True)
     def page(self, project=None, **kw):
         # create domain for rating
         domain = [('res_model', '=', 'project.task')]