Merge branch 'hotfix/5.0.2'

This commit is contained in:
yuri
2018-01-09 16:15:07 +02:00
4 changed files with 8 additions and 6 deletions
@@ -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');
@@ -13,11 +13,6 @@
"name": "maxLength",
"type": "int"
},
{
"name": "seeMoreDisabled",
"type": "bool",
"tooltip": true
},
{
"name": "height",
"type": "int"
+5 -1
View File
@@ -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;
+2
View File
@@ -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);