From a3bcdfd6f8913cf69709a2c3aacc263799e55166 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 21 Nov 2014 10:22:54 +0100 Subject: [PATCH] [FIX] project, project_issue: when no project in context, display default columns in kanban view. Also fixed some issues in the issue kanban view. --- addons/project/project.py | 7 ++++--- addons/project_issue/project_issue.py | 7 ++++--- addons/project_issue/project_issue_view.xml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index a83962e..7936a20 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -686,12 +686,13 @@ class task(osv.osv): search_domain = [] project_id = self._resolve_project_id_from_context(cr, uid, context=context) if project_id: - search_domain += ['|', ('project_ids', '=', project_id)] - search_domain += [('id', 'in', ids)] + search_domain += ['|', ('project_ids', '=', project_id), ('id', 'in', ids)] + else: + search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)] stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context) result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context) # restore order of the search - result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0]))) + result.sort(lambda x, y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0]))) fold = {} for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context): diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index bc9e879..a15f94e 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -113,13 +113,14 @@ class project_issue(osv.Model): search_domain = [] project_id = self._resolve_project_id_from_context(cr, uid, context=context) if project_id: - search_domain += ['|', ('project_ids', '=', project_id)] - search_domain += [('id', 'in', ids)] + search_domain += ['|', ('project_ids', '=', project_id), ('id', 'in', ids)] + else: + search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)] # perform search stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context) result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context) # restore order of the search - result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0]))) + result.sort(lambda x, y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0]))) fold = {} for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context): diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index ee6b123..9457ce4 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -194,7 +194,7 @@ project.issue - + -- 1.7.10.4