From b72924c126fcdcd356cc8a02b3cc31fbf3c691b3 Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 8 Dec 2015 17:15:04 +0200 Subject: [PATCH] panel view disabled check --- frontend/client/src/views/record/detail-bottom.js | 12 ++++++------ frontend/client/src/views/record/detail-side.js | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/client/src/views/record/detail-bottom.js b/frontend/client/src/views/record/detail-bottom.js index a8eeddfe52..1067f0b6f4 100644 --- a/frontend/client/src/views/record/detail-bottom.js +++ b/frontend/client/src/views/record/detail-bottom.js @@ -302,9 +302,9 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) { getFields: function () { var fields = {}; this.panelList.forEach(function (p) { - var panel = this.getView(p.name); - if ('getFields' in panel) { - fields = _.extend(fields, panel.getFields()); + var panelView = this.getView(p.name); + if (!panelView.disabled && 'getFields' in panelView) { + fields = _.extend(fields, panelView.getFields()); } }, this); return fields; @@ -314,9 +314,9 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) { var data = {}; this.panelList.forEach(function (p) { - var panel = this.getView(p.name); - if ('fetch' in panel) { - data = _.extend(data, panel.fetch()); + var panelView = this.getView(p.name); + if (!panelView.disabled && 'fetch' in panelView) { + data = _.extend(data, panelView.fetch()); } }, this); return data; diff --git a/frontend/client/src/views/record/detail-side.js b/frontend/client/src/views/record/detail-side.js index e84a21d13c..fd3d9f09e9 100644 --- a/frontend/client/src/views/record/detail-side.js +++ b/frontend/client/src/views/record/detail-side.js @@ -174,9 +174,9 @@ Espo.define('views/record/detail-side', 'view', function (Dep) { getFields: function () { var fields = {}; this.panelList.forEach(function (p) { - var panel = this.getView(p.name); - if ('getFields' in panel) { - fields = _.extend(fields, panel.getFields()); + var panelView = this.getView(p.name); + if (!panelView.disabled && 'getFields' in panelView) { + fields = _.extend(fields, panelView.getFields()); } }, this); return fields; @@ -186,9 +186,9 @@ Espo.define('views/record/detail-side', 'view', function (Dep) { var data = {}; this.panelList.forEach(function (p) { - var panel = this.getView(p.name); - if ('fetch' in panel) { - data = _.extend(data, panel.fetch()); + var panelView = this.getView(p.name); + if (!panelView.disabled && 'fetch' in panelView) { + data = _.extend(data, panelView.fetch()); } }, this); return data;