Merge lp:~openerp-dev/openerp-web/trunk-bug-910767-vme into lp:openerp-web

Proposed by Vidhin Mehta (OpenERP)
Status: Merged
Merge reported by: Fabien Meghazi (OpenERP)
Merged at revision: not available
Proposed branch: lp:~openerp-dev/openerp-web/trunk-bug-910767-vme
Merge into: lp:openerp-web
Diff against target: 15 lines (+5/-0)
1 file modified
addons/web/static/src/js/formats.js (+5/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-bug-910767-vme
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+87320@code.launchpad.net

Description of the change

Boolean fields shows check box in list view.

To post a comment you must log in.
1855. By Vidhin Mehta (OpenERP)

[MERGE]merge with main branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/formats.js'
2--- addons/web/static/src/js/formats.js 2011-12-30 16:46:55 +0000
3+++ addons/web/static/src/js/formats.js 2012-01-09 13:03:24 +0000
4@@ -254,6 +254,11 @@
5 attrs = column.modifiers_for(row_data);
6 }
7 if (attrs.invisible) { return ''; }
8+
9+ if(column.type === "boolean")
10+ return _.str.sprintf('<input type="checkbox" %s disabled="disabled" />',
11+ row_data[column.id].value ? 'checked="checked"':'');
12+
13 if (column.tag === 'button') {
14 return _.template('<button type="button" title="<%-title%>" <%=additional_attributes%> >' +
15 '<img src="<%-prefix%>/web/static/src/img/icons/<%-icon%>.png" alt="<%-alt%>"/>' +