From 9845f41c098278873ebc11d8962e0e532c8fafa0 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 25 Mar 2013 11:40:12 +0100 Subject: [PATCH] [IMP] project, project_issue: improve get_empty_list_help bzr revid: chm@openerp.com-20130325104012-h5ryupgzglia4twg --- addons/crm/crm_lead.py | 2 +- addons/mail/mail_thread.py | 4 ++-- addons/project/project.py | 5 +++-- addons/project_issue/project_issue.py | 5 +++-- addons/project_issue/project_issue_view.xml | 4 +--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 1f601c3edcf..1e6783e6a69 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -88,7 +88,7 @@ class crm_lead(base_stage, format_address, osv.osv): if context.get('default_type', None) == 'lead': context['empty_list_help_model'] = 'crm.case.section' context['empty_list_help_id'] = context.get('default_section_id', None) - context['empty_list_help_document_name'] = _("leads") + context['empty_list_help_document_name'] = _("leads") return super(crm_lead, self).get_empty_list_help(cr, uid, help, context=context) def onchange_user_id(self, cr, uid, ids, section_id, user_id, context=None): diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 743d76bf539..cf3bae6e471 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -90,8 +90,8 @@ class mail_thread(osv.AbstractModel): _track = {} def get_empty_list_help(self, cr, uid, help, context=None): - if not context.get('empty_list_help_model', None): - if context.get('empty_list_help_id', None): + if context.get('empty_list_help_model'): + if context.get('empty_list_help_id'): object_id = self.pool.get(context.get('empty_list_help_model')).browse(cr, uid, context.get('empty_list_help_id'), context=context) alias = object_id.alias_id and object_id.alias_id.name_get() or False if alias and alias[0] and alias[0][1]: diff --git a/addons/project/project.py b/addons/project/project.py index eba05921d46..c6446da6c13 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -890,8 +890,9 @@ class task(base_stage, osv.osv): def get_empty_list_help(self, cr, uid, help, context=None): - context['empty_list_help_model'] = 'project.project' - context['empty_list_help_id'] = context.get('default_project_id', None) + if context.get('active_id') and self.pool.get('project.project').browse(cr, uid, context['active_id'], context=context).alias_model == 'project.task': + context['empty_list_help_model'] = 'project.project' + context['empty_list_help_id'] = context.get('default_project_id', None) context['empty_list_help_document_name'] = _("tasks") return super(task, self).get_empty_list_help(cr, uid, help, context=context) diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 33a85a37ed1..84247a9fc52 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -421,8 +421,9 @@ class project_issue(base_stage, osv.osv): return res def get_empty_list_help(self, cr, uid, help, context=None): - context['empty_list_help_model'] = 'project.project' - context['empty_list_help_id'] = context.get('default_project_id', None) + if context.get('active_id') and self.pool.get('project.project').browse(cr, uid, context['active_id'], context=context).alias_model == 'project.issue': + context['empty_list_help_model'] = 'project.project' + context['empty_list_help_id'] = context.get('default_project_id', None) context['empty_list_help_document_name'] = _("issues") return super(project_issue, self).get_empty_list_help(cr, uid, help, context=context) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 5dc0106eb85..c6d23bfae6d 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -307,9 +307,7 @@ 'default_project_id': active_id } -

- Click to report a new issue. -

+

The OpenERP issues tacker allows you to efficiantly manage things like internal requests, software development bugs, customer complaints, project troubles, material breakdowns, etc.