From da136d83bb4cd952dc0e2417d67679cfc5068f34 Mon Sep 17 00:00:00 2001
From: fwi-odoo <fwi@odoo.com>
Date: Fri, 15 Sep 2017 10:19:16 +0200
Subject: [IMP] web: x2m list: conditionnaly hide a column

This commit introduces a new way to hide a column in a x2m list view.
The attribute 'tree_invisible' can be add in the field attrs in the x2m
view definition. This attribute can use the 'parent' key to make a reference
to the parent record (e.g. 'parent.id').
---
 addons/web/static/src/js/views/basic/basic_model.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 d85f55ddf36..6500fb43b85 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -1689,6 +1689,9 @@ var BasicModel = AbstractModel.extend({
         if ('invisible' in modifiers) {
             result.invisible = evalModifier(modifiers.invisible);
         }
+        if ('column_invisible' in modifiers) {
+            result.column_invisible = evalModifier(modifiers.column_invisible);
+        }
         if ('readonly' in modifiers) {
             result.readonly = evalModifier(modifiers.readonly);
         }
@@ -2847,7 +2850,7 @@ var BasicModel = AbstractModel.extend({
     _isFieldProtected: function (record, fieldName, viewType) {
         var fieldInfo = record.fieldsInfo[viewType || record.viewType][fieldName];
         if (fieldInfo) {
-            var rawModifiers = JSON.parse(fieldInfo.modifiers || "{}");
+            var rawModifiers = fieldInfo.modifiers || {};
             var modifiers = this._evalModifiers(record, rawModifiers);
             return modifiers.readonly && !fieldInfo.force_save;
         } else {
@@ -2899,7 +2902,7 @@ var BasicModel = AbstractModel.extend({
             _.each(element.getFieldNames(), function (fieldName) {
                 var field = element.fields[fieldName];
                 var fieldInfo = element.fieldsInfo[element.viewType][fieldName];
-                var rawModifiers = JSON.parse(fieldInfo.modifiers || "{}");
+                var rawModifiers = fieldInfo.modifiers || {};
                 var modifiers = self._evalModifiers(record, rawModifiers);
                 if (modifiers.required && !self._isFieldSet(recordData[fieldName], field.type)) {
                     isValid = false;
-- 
cgit v1.2.3