diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/project/models/project.py | 2 | ||||
| -rw-r--r-- | addons/project/views/project_views.xml | 5 | ||||
| -rw-r--r-- | addons/project/views/rating_views.xml | 15 | ||||
| -rw-r--r-- | addons/rating/views/rating_view.xml | 4 |
4 files changed, 5 insertions, 21 deletions
diff --git a/addons/project/models/project.py b/addons/project/models/project.py index 4f5d68b0aea..c1e802839da 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -409,7 +409,7 @@ class Project(models.Model): action['name'] = _('Ratings of %s') % (self.name,) action_context = safe_eval(action['context']) if action['context'] else {} action_context.update(self._context) - action_context['search_default_rating_tasks'] = 1 + action_context['search_default_parent_res_name'] = self.name return dict(action, context=action_context) # --------------------------------------------------- diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index a09293f80df..3fc53cf4892 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -124,9 +124,6 @@ <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/> </button> - <button name="%(project.rating_rating_action_view_project_rating_task)d" attrs="{'invisible': ['|', '|', ('rating_status', '=', 'no'), ('use_tasks','=', False), ('percentage_satisfaction_task', '=', -1)]}" class="oe_stat_button oe_percent" type="action" icon="fa-smile-o" groups="project.group_project_rating"> - <field string="% On tasks" name="percentage_satisfaction_task" widget="statinfo"/> - </button> </div> <div class="oe_title"> <h1> @@ -320,7 +317,7 @@ <div t-if="record.alias_name.value and record.alias_domain.value"> <span><i class="fa fa-envelope"></i> <t t-esc="record.alias_id.value"/></span> </div> - <div t-if="record.rating_status.raw_value != 'no'" class="mt8 text-primary" title="Percentage of happy ratings over the past 30 days. Get rating details from the More menu."> + <div t-if="record.rating_status.raw_value != 'no'" class="mt8 text-primary" title="Percentage of happy ratings over the past 30 days. Get rating details from the More menu." groups="project.group_project_rating"> <b> <t t-if="record.percentage_satisfaction_project.value == -1"> <i class="fa fa-smile-o"/> No rating yet diff --git a/addons/project/views/rating_views.xml b/addons/project/views/rating_views.xml index 87dc95ac43f..7c731ac5963 100644 --- a/addons/project/views/rating_views.xml +++ b/addons/project/views/rating_views.xml @@ -22,7 +22,7 @@ <field name="name">Rating</field> <field name="res_model">rating.rating</field> <field name="view_mode">kanban,tree,graph,pivot,form</field> - <field name="domain">[('consumed','=',True), ('parent_res_model','=','project.project'), ('parent_res_id','=',active_id)]</field> + <field name="domain">[('consumed','=',True), ('parent_res_model','=','project.project')]</field> <field name="search_view_id" ref="rating_rating_view_search_project"/> <field name="help" type="html"> <p> @@ -31,19 +31,6 @@ </field> </record> - <record id="rating_rating_action_view_project_rating_task" model="ir.actions.act_window"> - <field name="name">Ratings for tasks</field> - <field name="res_model">rating.rating</field> - <field name="view_mode">kanban,tree,graph,pivot,form</field> - <field name="domain">[('consumed','=',True), ('parent_res_model','=','project.project'), ('parent_res_id','=',active_id), ('res_model','=','project.task')]</field> - <field name="search_view_id" ref="rating_rating_view_search_project"/> - <field name="help" type="html"> - <p> - There is no rating for tasks of this project at the moment. - </p> - </field> - </record> - <record id="rating_rating_action_task" model="ir.actions.act_window"> <field name="name">Customer Ratings</field> <field name="res_model">rating.rating</field> diff --git a/addons/rating/views/rating_view.xml b/addons/rating/views/rating_view.xml index 10e1894b0dc..5c6100cadb1 100644 --- a/addons/rating/views/rating_view.xml +++ b/addons/rating/views/rating_view.xml @@ -134,9 +134,9 @@ <field name="rated_partner_id"/> <field name="rating"/> <field name="partner_id"/> - <field name="res_name"/> + <field name="res_name" filter_domain="[('res_name','ilike',self)]"/> <field name="res_id"/> - <field name="parent_res_name"/> + <field name="parent_res_name" filter_domain="[('parent_res_name','ilike',self)]"/> <filter string="Satisfied" name="rating_happy" domain="[('rating_text', '=', 'satisfied')]"/> <filter string="Not satisfied" name="rating_okay" domain="[('rating_text', '=', 'not_satisfied')]"/> <filter string="Highly dissatisfied" name="rating_unhappy" domain="[('rating_text', '=', 'highly_dissatisfied')]"/> |