diff --git a/application/Espo/Modules/Crm/Repositories/Opportunity.php b/application/Espo/Modules/Crm/Repositories/Opportunity.php index 84abca5f52..c24ffc5a44 100644 --- a/application/Espo/Modules/Crm/Repositories/Opportunity.php +++ b/application/Espo/Modules/Crm/Repositories/Opportunity.php @@ -47,6 +47,7 @@ class Opportunity extends \Espo\Core\ORM\Repositories\RDB public function afterSave(Entity $entity, array $options = array()) { + parent::afterSave($entity, $options); if ($entity->isAttributeChanged('amount') || $entity->isAttributeChanged('probability')) { $amountConverted = $entity->get('amountConverted'); $probability = $entity->get('probability'); diff --git a/application/Espo/Resources/metadata/fields/wysiwyg.json b/application/Espo/Resources/metadata/fields/wysiwyg.json index d348e0a372..91fcfed96c 100644 --- a/application/Espo/Resources/metadata/fields/wysiwyg.json +++ b/application/Espo/Resources/metadata/fields/wysiwyg.json @@ -13,11 +13,6 @@ "name": "maxLength", "type": "int" }, - { - "name": "seeMoreDisabled", - "type": "bool", - "tooltip": true - }, { "name": "height", "type": "int" diff --git a/client/src/views/fields/text.js b/client/src/views/fields/text.js index 4b97426ee5..2fd383e371 100644 --- a/client/src/views/fields/text.js +++ b/client/src/views/fields/text.js @@ -50,6 +50,8 @@ Espo.define('views/fields/text', 'views/fields/base', function (Dep) { rowsMin: 2, + seeMoreDisabled: false, + searchTypeList: ['contains', 'startsWith', 'equals', 'endsWith', 'like', 'notContains', 'notLike', 'isEmpty', 'isNotEmpty'], events: { @@ -64,6 +66,8 @@ Espo.define('views/fields/text', 'views/fields/base', function (Dep) { this.params.rows = this.params.rows || this.rowsDefault; this.detailMaxLength = this.params.lengthOfCut || this.detailMaxLength; + this.seeMoreDisabled = this.seeMoreDisabled || this.params.seeMoreDisabled; + this.autoHeightDisabled = this.options.autoHeightDisabled || this.params.autoHeightDisabled || this.autoHeightDisabled; if (this.params.rows < this.rowsMin) { @@ -117,7 +121,7 @@ Espo.define('views/fields/text', 'views/fields/base', function (Dep) { getValueForDisplay: function () { var text = this.model.get(this.name); - if (text && (this.mode == 'detail' || this.mode == 'list') && !this.seeMoreText && !this.params.seeMoreDisabled) { + if (text && (this.mode == 'detail' || this.mode == 'list') && !this.seeMoreText && !this.seeMoreDisabled) { var maxLength = this.detailMaxLength; var isCut = false; diff --git a/client/src/views/fields/wysiwyg.js b/client/src/views/fields/wysiwyg.js index 1ab68dfbf3..d6e8428a24 100644 --- a/client/src/views/fields/wysiwyg.js +++ b/client/src/views/fields/wysiwyg.js @@ -40,6 +40,8 @@ Espo.define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], fun rowsDefault: 15, + seeMoreDisabled: true, + setup: function () { Dep.prototype.setup.call(this);