Merge lp:~unifield-team/unifield-web/uf-2235 into lp:unifield-web

Proposed by Quentin THEURET @Amaris
Status: Merged
Merged at revision: 4728
Proposed branch: lp:~unifield-team/unifield-web/uf-2235
Merge into: lp:unifield-web
Diff against target: 12 lines (+1/-1)
1 file modified
addons/openerp/static/javascript/form_state.js (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/uf-2235
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+196236@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/openerp/static/javascript/form_state.js'
--- addons/openerp/static/javascript/form_state.js 2013-05-28 12:06:40 +0000
+++ addons/openerp/static/javascript/form_state.js 2013-11-22 08:55:38 +0000
@@ -245,7 +245,7 @@
245 switch (attr) {245 switch (attr) {
246 case 'readonly':246 case 'readonly':
247 var editable = openobject.dom.get(prefix + '_terp_editable');247 var editable = openobject.dom.get(prefix + '_terp_editable');
248 if (editable && (editable.value == 0 || editable.value == 'False')) {248 if (widget.type != 'button' && editable && (editable.value == 0 || editable.value == 'False')) {
249 // We are in 'non-editable' mode, so we force readonly = True249 // We are in 'non-editable' mode, so we force readonly = True
250 // whatever readonly attrs result250 // whatever readonly attrs result
251 result = true;251 result = true;

Subscribers

People subscribed via source and target branches

to all changes: