From b6653f99be65b6b8a397baec9d2ceeaefb36873e Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 13 Nov 2018 16:38:08 +0200 Subject: [PATCH] inline edit disabled param --- application/Espo/Core/Utils/FieldManager.php | 10 +++++++--- application/Espo/Resources/i18n/en_US/Admin.json | 3 ++- client/src/views/admin/field-manager/edit.js | 7 +++++++ client/src/views/fields/base.js | 6 ++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/application/Espo/Core/Utils/FieldManager.php b/application/Espo/Core/Utils/FieldManager.php index a44a016701..c5addb5523 100644 --- a/application/Espo/Core/Utils/FieldManager.php +++ b/application/Espo/Core/Utils/FieldManager.php @@ -447,16 +447,20 @@ class FieldManager { $additionalParamList = [ 'type' => [ - 'type' => 'varchar', + 'type' => 'varchar' ], 'isCustom' => [ 'type' => 'bool', - 'default' => false, + 'default' => false ], 'isPersonalData' => [ 'type' => 'bool', - 'default' => false, + 'default' => false ], + 'inlineEditDisabled' => [ + 'type' => 'bool', + 'default' => false + ] ]; $fieldDefsByType = $this->getMetadataHelper()->getFieldDefsByType($fieldDefs); diff --git a/application/Espo/Resources/i18n/en_US/Admin.json b/application/Espo/Resources/i18n/en_US/Admin.json index fab605c155..f39bdd23ee 100644 --- a/application/Espo/Resources/i18n/en_US/Admin.json +++ b/application/Espo/Resources/i18n/en_US/Admin.json @@ -177,7 +177,8 @@ "useIframe": "Use Iframe", "useNumericFormat": "Use Numeric Format", "strip": "Strip", - "minuteStep": "Minutes Step" + "minuteStep": "Minutes Step", + "inlineEditDisabled": "Disable Inline Edit" }, "messages": { "upgradeVersion": "EspoCRM will be upgraded to version {version}. Please be patient as this may take a while.", diff --git a/client/src/views/admin/field-manager/edit.js b/client/src/views/admin/field-manager/edit.js index 9d8f9be82c..8613ea8d71 100644 --- a/client/src/views/admin/field-manager/edit.js +++ b/client/src/views/admin/field-manager/edit.js @@ -152,6 +152,11 @@ Espo.define('views/admin/field-manager/edit', ['view', 'model'], function (Dep, }); } + this.paramList.push({ + name: 'inlineEditDisabled', + type: 'bool' + }); + this.paramList.forEach(function (o) { this.model.defs.fields[o.name] = o; }, this); @@ -178,6 +183,8 @@ Espo.define('views/admin/field-manager/edit', ['view', 'model'], function (Dep, this.createFieldView('bool', 'isPersonalData', null, {}); } + this.createFieldView('bool', 'inlineEditDisabled', null, {}); + this.createFieldView('text', 'tooltipText', null, { trim: true, rows: 1 diff --git a/client/src/views/fields/base.js b/client/src/views/fields/base.js index 2c523b4569..04f963a3df 100644 --- a/client/src/views/fields/base.js +++ b/client/src/views/fields/base.js @@ -232,6 +232,12 @@ Espo.define('views/fields/base', 'view', function (Dep) { } }, this); + var additionaParamList = ['inlineEditDisabled']; + + additionaParamList.forEach(function (item) { + this.params[item] = this.model.getFieldParam(this.name, item) || null; + }, this); + this.mode = this.options.mode || this.mode; this.readOnly = this.readOnly || this.params.readOnly || this.model.getFieldParam(this.name, 'readOnly') || this.model.getFieldParam(this.name, 'clientReadOnly');