diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-11-21 10:22:54 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-11-21 10:27:44 +0100 |
| commit | a3bcdfd6f8913cf69709a2c3aacc263799e55166 (patch) | |
| tree | e281ecd29514b5ee5b62d2236814ab5b908b7069 /addons/project_issue | |
| parent | bbac3e061729badb01d04e9077498478d79f76fb (diff) | |
[FIX] project, project_issue: when no project in context, display default
columns in kanban view. Also fixed some issues in the issue kanban view.
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 7 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index bc9e879b901..a15f94ed8a5 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 ee6b123cdfa..9457ce48485 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -194,7 +194,7 @@ <field name="model">project.issue</field> <field name="arch" type="xml"> <kanban default_group_by="stage_id"> - <field name="stage_id" options='{"group_by_tooltip": {"Description": "description", "Use of stars": "legend_priority"}}'/> + <field name="stage_id" options='{"group_by_tooltip": {"description": "Description", "legend_priority": "Use of stars"}}'/> <field name="color"/> <field name="priority"/> <field name="user_email"/> |