From a43b0464b28ce53074b027469747e379bbb389c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Wed, 5 Jul 2017 13:41:24 +0200 Subject: [FIX] web: better handling for readonly modifiers Before this commit, the web client read the readonly in the modifiers, and if no readonly was in the modifiers, it fell back to the field property. But the field property was already taken into account in the modifiers, so this was useless. And worse, in some case, it could cause an issue. For example, a field with readonly=true, and readonly="0" in the arch was considered readonly. --- addons/web/static/src/js/views/basic/basic_model.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'addons/web/static/src/js/views/basic/basic_model.js') diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js index 01b2a18091a..61c153e9032 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -2539,15 +2539,12 @@ var BasicModel = AbstractModel.extend({ */ _isFieldReadonly: function (record, fieldName, viewType) { var fieldInfo = record.fieldsInfo[viewType || record.viewType][fieldName]; - var modifiers; if (fieldInfo) { var rawModifiers = JSON.parse(fieldInfo.modifiers || "{}"); - modifiers = this._evalModifiers(record, rawModifiers); - } - if (modifiers && 'readonly' in modifiers) { + var modifiers = this._evalModifiers(record, rawModifiers); return modifiers.readonly; } else { - return record.fields[fieldName].readonly; + return false; } }, /** -- cgit v1.2.3