diff --git a/application/Espo/Core/Formula/Functions/SetAttributeType.php b/application/Espo/Core/Formula/Functions/SetAttributeType.php
index 850552a067..67c5f01f5e 100644
--- a/application/Espo/Core/Formula/Functions/SetAttributeType.php
+++ b/application/Espo/Core/Formula/Functions/SetAttributeType.php
@@ -48,6 +48,10 @@ class SetAttributeType extends Base
throw new Error("SetAttribute: First argument is not string.");
}
+ if ($name === 'id') {
+ throw new Error("Formula set-attribute: Not allowed to set `id` attribute.");
+ }
+
$value = $this->evaluate($item->value[1]);
$this->getEntity()->set($name, $value);
diff --git a/application/Espo/Resources/defaults/config.php b/application/Espo/Resources/defaults/config.php
index d7beeb08ae..22446014fc 100644
--- a/application/Espo/Resources/defaults/config.php
+++ b/application/Espo/Resources/defaults/config.php
@@ -38,6 +38,17 @@ return [
'password' => '',
],
'useCache' => true,
+ /** Max number of jobs per one execution. */
+ 'jobMaxPortion' => 15,
+ /** Jobs will be executed in parallel processes. */
+ 'jobRunInParallel' => false,
+ /** Max number of processes run simultaneously. */
+ 'jobPoolConcurrencyNumber' => 8,
+ /** Max number of CRON processes run simultaneously. */
+ 'daemonMaxProcessNumber' => 5,
+ /** Interval between process runs in seconds. */
+ 'daemonInterval' => 10,
+ 'daemonProcessTimeout' => 36000,
'recordsPerPage' => 20,
'recordsPerPageSmall' => 5,
'recordsPerPageSelect' => 10,
@@ -78,8 +89,35 @@ return [
'Lead',
'Opportunity',
],
- 'tabList' => ["Account", "Contact", "Lead", "Opportunity", "Case", "Email", "Calendar", "Meeting", "Call", "Task", "_delimiter_", "Document", "Campaign", "KnowledgeBaseArticle", "Stream", "User"],
- 'quickCreateList' => ["Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case", "Email"],
+ 'tabList' => [
+ "Account",
+ "Contact",
+ "Lead",
+ "Opportunity",
+ "Case",
+ "Email",
+ "Calendar",
+ "Meeting",
+ "Call",
+ "Task",
+ "_delimiter_",
+ "Document",
+ "Campaign",
+ "KnowledgeBaseArticle",
+ "Stream",
+ "User"
+ ],
+ 'quickCreateList' => [
+ "Account",
+ "Contact",
+ "Lead",
+ "Opportunity",
+ "Meeting",
+ "Call",
+ "Task",
+ "Case",
+ "Email"
+ ],
'exportDisabled' => false,
'adminNotifications' => true,
'adminNotificationsNewVersion' => true,
@@ -163,5 +201,16 @@ return [
'pdfEngine' => 'Tcpdf',
'smsProvider' => null,
'defaultFileStorage' => 'EspoUploadDir',
+ 'ldapUserNameAttribute' => 'sAMAccountName',
+ 'ldapUserFirstNameAttribute' => 'givenName',
+ 'ldapUserLastNameAttribute' => 'sn',
+ 'ldapUserTitleAttribute' => 'title',
+ 'ldapUserEmailAddressAttribute' => 'mail',
+ 'ldapUserPhoneNumberAttribute' => 'telephoneNumber',
+ 'ldapUserObjectClass' => 'person',
+ 'ldapPortalUserLdapAuth' => false,
+ 'passwordGenerateLength' => 10,
+ 'massActionIdleCountThreshold' => 100,
+ 'exportIdleCountThreshold' => 1000,
'isInstalled' => false,
];
diff --git a/application/Espo/Resources/defaults/systemConfig.php b/application/Espo/Resources/defaults/systemConfig.php
index 8fed3df4a1..e70eb1ebd7 100644
--- a/application/Espo/Resources/defaults/systemConfig.php
+++ b/application/Espo/Resources/defaults/systemConfig.php
@@ -34,28 +34,6 @@ return [
'user' => '',
'group' => '',
],
- /** Max number of jobs per one execution. */
- 'jobMaxPortion' => 15,
- /** Max execution time (in seconds) allocated for a single job. If exceeded then set to Failed.*/
- 'jobPeriod' => 7800,
- /**
- * Max execution time (in seconds) allocated for a single job with active process.
- * If exceeded then set to Failed.
- */
- 'jobPeriodForActiveProcess' => 36000,
- /** Number of attempts to re-run failed jobs. */
- 'jobRerunAttemptNumber' => 1,
- /** Jobs will be executed in parallel processes. */
- 'jobRunInParallel' => false,
- /** Max number of processes run simultaneously. */
- 'jobPoolConcurrencyNumber' => 8,
- /** Min interval (in seconds) between two CRON runs. */
- 'cronMinInterval' => 2,
- /** Max number of CRON processes run simultaneously. */
- 'daemonMaxProcessNumber' => 5,
- /** Interval between process runs in seconds. */
- 'daemonInterval' => 10,
- 'daemonProcessTimeout' => 36000,
'crud' => [
'get' => 'read',
'post' => 'create',
@@ -253,13 +231,6 @@ return [
'aclAllowDeleteCreated',
],
'isInstalled' => false,
- 'ldapUserNameAttribute' => 'sAMAccountName',
- 'ldapUserFirstNameAttribute' => 'givenName',
- 'ldapUserLastNameAttribute' => 'sn',
- 'ldapUserTitleAttribute' => 'title',
- 'ldapUserEmailAddressAttribute' => 'mail',
- 'ldapUserPhoneNumberAttribute' => 'telephoneNumber',
- 'ldapUserObjectClass' => 'person',
'requiredPhpVersion' => '7.4.0',
'requiredPhpLibs' => [
'json',
@@ -287,8 +258,13 @@ return [
'recommendedMysqlParams' => [],
'requiredMariadbVersion' => '10.1.0',
'recommendedMariadbParams' => [],
- 'ldapPortalUserLdapAuth' => false,
- 'passwordGenerateLength' => 10,
- 'massActionIdleCountThreshold' => 100,
- 'exportIdleCountThreshold' => 1000,
+ /** Max execution time (in seconds) allocated for a single job. If exceeded then set to Failed.*/
+ 'jobPeriod' => 7800,
+ /** Max execution time (in seconds) allocated for a single job with active process.
+ * If exceeded then set to Failed. */
+ 'jobPeriodForActiveProcess' => 36000,
+ /** Number of attempts to re-run failed jobs. */
+ 'jobRerunAttemptNumber' => 1,
+ /** Min interval (in seconds) between two CRON runs. */
+ 'cronMinInterval' => 2,
];
diff --git a/application/Espo/Resources/metadata/app/linkManager.json b/application/Espo/Resources/metadata/app/linkManager.json
index 49abc8705e..9bf2b5a21d 100644
--- a/application/Espo/Resources/metadata/app/linkManager.json
+++ b/application/Espo/Resources/metadata/app/linkManager.json
@@ -1,6 +1,7 @@
{
"createHookClassNameList": [
- "Espo\\Tools\\EntityManager\\Link\\Hooks\\TargetListCreate"
+ "Espo\\Tools\\EntityManager\\Link\\Hooks\\TargetListCreate",
+ "Espo\\Tools\\EntityManager\\Link\\Hooks\\AssignedUsersCreate"
],
"deleteHookClassNameList": [
"Espo\\Tools\\EntityManager\\Link\\Hooks\\TargetListDelete",
diff --git a/application/Espo/Tools/EntityManager/Link/Hooks/AssignedUsersCreate.php b/application/Espo/Tools/EntityManager/Link/Hooks/AssignedUsersCreate.php
new file mode 100644
index 0000000000..744f2a62e0
--- /dev/null
+++ b/application/Espo/Tools/EntityManager/Link/Hooks/AssignedUsersCreate.php
@@ -0,0 +1,101 @@
+metadata = $metadata;
+ }
+
+ public function process(Params $params): void
+ {
+ if ($params->getType() !== Type::MANY_TO_MANY) {
+ return;
+ }
+
+ $foreignEntityType = $params->getForeignEntityType();
+ $entityType = $params->getEntityType();
+
+ if (!$foreignEntityType || !$entityType) {
+ return;
+ }
+
+ if (
+ $params->getEntityType() === User::ENTITY_TYPE &&
+ $params->getForeignLink() === self::LINK_NAME
+ ) {
+ $this->processInternal($foreignEntityType);
+
+ return;
+ }
+
+ if (
+ $params->getForeignEntityType() === User::ENTITY_TYPE &&
+ $params->getLink() === self::LINK_NAME
+ ) {
+ $this->processInternal($entityType);
+
+ return;
+ }
+ }
+
+ private function processInternal(string $entityType): void
+ {
+ $fieldType = $this->metadata->get(['entityDefs', $entityType, 'fields', self::LINK_NAME, 'type']);
+
+ if ($fieldType !== 'linkMultiple') {
+ return;
+ }
+
+ $this->metadata->set('entityDefs', $entityType, [
+ 'fields' => [
+ self::LINK_NAME => [
+ 'view' => 'views/fields/assigned-users',
+ ],
+ ]
+ ]);
+
+ $this->metadata->save();
+ }
+}
diff --git a/client/res/templates/record/list-tree.tpl b/client/res/templates/record/list-tree.tpl
index cb60807f07..16d6c56b2d 100644
--- a/client/res/templates/record/list-tree.tpl
+++ b/client/res/templates/record/list-tree.tpl
@@ -7,14 +7,11 @@
{{/if}}
-{{#unless rowList.length}}
- {{#if createDisabled}}
- {{#unless showRoot}}
-
{{translate 'No Data'}}
- {{/unless}}
- {{/if}}
-{{/unless}}
-
+{{#if noData}}
+
{{translate 'No Data'}}
+{{/if}}
+
+
{{#if showRootMenu}}
diff --git a/client/src/views/admin/entity-manager/edit.js b/client/src/views/admin/entity-manager/edit.js
index 9696d70589..fdd3d4b845 100644
--- a/client/src/views/admin/entity-manager/edit.js
+++ b/client/src/views/admin/entity-manager/edit.js
@@ -557,6 +557,8 @@ define('views/admin/entity-manager/edit', ['view', 'model'], function (Dep, Mode
}
}
+ Espo.Ui.notify(this.translate('pleaseWait', 'messages'));
+
Espo.Ajax
.postRequest(url, data)
.then(() => {
diff --git a/client/src/views/admin/formula/fields/attribute.js b/client/src/views/admin/formula/fields/attribute.js
index 683fdafc52..091c17f91a 100644
--- a/client/src/views/admin/formula/fields/attribute.js
+++ b/client/src/views/admin/formula/fields/attribute.js
@@ -41,6 +41,7 @@ define('views/admin/formula/fields/attribute', 'views/fields/multi-enum', functi
var attributeList = this.getFieldManager()
.getEntityTypeAttributeList(this.options.scope)
+ .concat(['id'])
.sort();
var links = this.getMetadata().get(['entityDefs', this.options.scope, 'links']) || {};
diff --git a/client/src/views/fields/bool.js b/client/src/views/fields/bool.js
index ae074fc42e..32579ce82c 100644
--- a/client/src/views/fields/bool.js
+++ b/client/src/views/fields/bool.js
@@ -46,36 +46,53 @@ define('views/fields/bool', 'views/fields/base', function (Dep) {
data: function () {
var data = Dep.prototype.data.call(this);
+
data.valueIsSet = this.model.has(this.name);
+
return data;
},
afterRender: function () {
Dep.prototype.afterRender.call(this);
- if (this.mode == 'search') {
- this.$element.on('change', function () {
+ if (this.mode === 'search') {
+ this.$element.on('change', () => {
this.trigger('change');
- }.bind(this));
+ });
}
},
fetch: function () {
var value = this.$element.get(0).checked;
+
var data = {};
+
data[this.name] = value;
+
return data;
},
fetchSearch: function () {
var type = this.$element.val();
- if (!type) return;
+ if (!type) {
+ return;
+ }
if (type === 'any') {
return {
- type: 'in',
- value: [true, false],
+ type: 'or',
+ value: [
+ {
+ type: 'isTrue',
+ attribute: this.name,
+
+ },
+ {
+ type: 'isFalse',
+ attribute: this.name,
+ },
+ ],
data: {
type: type,
},
@@ -88,6 +105,7 @@ define('views/fields/bool', 'views/fields/base', function (Dep) {
type: type,
},
};
+
return data;
},
diff --git a/client/src/views/fields/formula.js b/client/src/views/fields/formula.js
index a28ddf3adc..39710e1596 100644
--- a/client/src/views/fields/formula.js
+++ b/client/src/views/fields/formula.js
@@ -349,6 +349,7 @@ define('views/fields/formula', 'views/fields/text', function (Dep) {
var attributeList = this.getFieldManager()
.getEntityTypeAttributeList(this.targetEntityType)
+ .concat(['id'])
.sort();
var links = this.getMetadata().get(['entityDefs', this.targetEntityType, 'links']) || {};
diff --git a/client/src/views/fields/range-currency.js b/client/src/views/fields/range-currency.js
index 45a074df65..f01d7bc824 100644
--- a/client/src/views/fields/range-currency.js
+++ b/client/src/views/fields/range-currency.js
@@ -26,7 +26,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-Espo.define('views/fields/range-currency', 'views/fields/range-float', function (Dep, Float) {
+define('views/fields/range-currency', 'views/fields/range-float', function (Dep, Float) {
return Dep.extend({
@@ -37,7 +37,8 @@ Espo.define('views/fields/range-currency', 'views/fields/range-float', function
data: function () {
return _.extend({
currencyField: this.currencyField,
- currencyValue: this.model.get(this.fromCurrencyField) || this.getPreferences().get('defaultCurrency') || this.getConfig().get('defaultCurrency'),
+ currencyValue: this.model.get(this.fromCurrencyField) ||
+ this.getPreferences().get('defaultCurrency') || this.getConfig().get('defaultCurrency'),
currencyOptions: this.currencyOptions,
currencyList: this.currencyList
}, Dep.prototype.data.call(this));
@@ -57,7 +58,8 @@ Espo.define('views/fields/range-currency', 'views/fields/range-float', function
afterRender: function () {
Dep.prototype.afterRender.call(this);
- if (this.mode == 'edit') {
+
+ if (this.mode === 'edit') {
this.$currency = this.$el.find('[data-name="' + this.currencyField + '"]');
}
},
@@ -69,15 +71,19 @@ Espo.define('views/fields/range-currency', 'views/fields/range-float', function
var fromValue = isNaN(fromValue) ? null : fromValue;
var toValue = isNaN(toValue) ? null : toValue;
- var currencyValue = this.model.get(this.fromCurrencyField) || this.model.get(this.toCurrencyField) ;
+ var currencyValue = this.model.get(this.fromCurrencyField) || this.model.get(this.toCurrencyField);
if (fromValue !== null && toValue !== null) {
- return this.formatNumber(fromValue) + ' – ' + this.formatNumber(toValue) + ' '+currencyValue+'';
- } else if (fromValue) {
+ return this.formatNumber(fromValue) + ' – ' +
+ this.formatNumber(toValue) + ' ' + currencyValue + '';
+ }
+ else if (fromValue) {
return '>= ' + this.formatNumber(fromValue) + ' '+currencyValue+'';
- } else if (toValue) {
+ }
+ else if (toValue) {
return '<= ' + this.formatNumber(toValue) + ' '+currencyValue+'';
- } else {
+ }
+ else {
return this.translate('None');
}
},
@@ -90,12 +96,15 @@ Espo.define('views/fields/range-currency', 'views/fields/range-float', function
if (data[this.fromField] !== null) {
data[this.fromCurrencyField] = currencyValue;
- } else {
+ }
+ else {
data[this.fromCurrencyField] = null;
}
+
if (data[this.toField] !== null) {
data[this.toCurrencyField] = currencyValue;
- } else {
+ }
+ else {
data[this.toCurrencyField] = null;
}
diff --git a/client/src/views/fields/range-float.js b/client/src/views/fields/range-float.js
index 24be68eedc..f688746ad7 100644
--- a/client/src/views/fields/range-float.js
+++ b/client/src/views/fields/range-float.js
@@ -26,7 +26,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-Espo.define('views/fields/range-float', ['views/fields/range-int', 'views/fields/float'], function (Dep, Float) {
+define('views/fields/range-float', ['views/fields/range-int', 'views/fields/float'], function (Dep, Float) {
return Dep.extend({
@@ -35,17 +35,22 @@ Espo.define('views/fields/range-float', ['views/fields/range-int', 'views/fields
validations: ['required', 'float', 'range', 'order'],
validateFloat: function () {
- var validate = function (name) {
+ var validate = (name) => {
if (isNaN(this.model.get(name))) {
- var msg = this.translate('fieldShouldBeFloat', 'messages').replace('{field}', this.getLabelText());
+ var msg = this.translate('fieldShouldBeFloat', 'messages')
+ .replace('{field}', this.getLabelText());
+
this.showValidationMessage(msg, '[data-name="'+name+'"]');
+
return true;
}
- }.bind(this);
+ };
var result = false;
+
result = validate(this.fromField) || result;
result = validate(this.toField) || result;
+
return result;
},
@@ -57,6 +62,14 @@ Espo.define('views/fields/range-float', ['views/fields/range-int', 'views/fields
return Float.prototype.formatNumber.call(this, value);
},
+ formatNumberDetail: function (value) {
+ return Float.prototype.formatNumberDetail.call(this, value);
+ },
+
+ formatNumberEdit: function (value) {
+ return Float.prototype.formatNumberEdit.call(this, value);
+ },
+
});
});
diff --git a/client/src/views/fields/range-int.js b/client/src/views/fields/range-int.js
index 6d55ea3454..9d9d8348b6 100644
--- a/client/src/views/fields/range-int.js
+++ b/client/src/views/fields/range-int.js
@@ -26,7 +26,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-Espo.define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], function (Dep, Int) {
+define('views/fields/range-int', ['views/fields/base', 'views/fields/int'], function (Dep, Int) {
return Dep.extend({
@@ -42,16 +42,20 @@ Espo.define('views/fields/range-int', ['views/fields/base', 'views/fields/int'],
data: function () {
var data = Dep.prototype.data.call(this);
+
data.ucName = Espo.Utils.upperCaseFirst(this.name);
data.fromValue = this.model.get(this.fromField);
data.toValue = this.model.get(this.toField);
+
return data;
},
init: function () {
var ucName = Espo.Utils.upperCaseFirst(this.options.defs.name);
+
this.fromField = 'from' + ucName;
this.toField = 'to' + ucName;
+
Dep.prototype.init.call(this);
},
@@ -64,11 +68,14 @@ Espo.define('views/fields/range-int', ['views/fields/base', 'views/fields/int'],
if (fromValue !== null && toValue !== null) {
return this.formatNumber(fromValue) + ' – ' + this.formatNumber(toValue);
- } else if (fromValue) {
+ }
+ else if (fromValue) {
return '>= ' + this.formatNumber(fromValue);
- } else if (toValue) {
+ }
+ else if (toValue) {
return '<= ' + this.formatNumber(toValue);
- } else {
+ }
+ else {
return this.translate('None');
}
},
@@ -76,14 +83,17 @@ Espo.define('views/fields/range-int', ['views/fields/base', 'views/fields/int'],
setup: function () {
if (this.getPreferences().has('decimalMark')) {
this.decimalMark = this.getPreferences().get('decimalMark');
- } else {
+ }
+ else {
if (this.getConfig().has('decimalMark')) {
this.decimalMark = this.getConfig().get('decimalMark');
}
}
+
if (this.getPreferences().has('thousandSeparator')) {
this.thousandSeparator = this.getPreferences().get('thousandSeparator');
- } else {
+ }
+ else {
if (this.getConfig().has('thousandSeparator')) {
this.thousandSeparator = this.getConfig().get('thousandSeparator');
}
@@ -92,53 +102,63 @@ Espo.define('views/fields/range-int', ['views/fields/base', 'views/fields/int'],
afterRender: function () {
Dep.prototype.afterRender.call(this);
- if (this.mode == 'edit') {
+
+ if (this.mode === 'edit') {
this.$from = this.$el.find('[data-name="' + this.fromField + '"]');
this.$to = this.$el.find('[data-name="' + this.toField + '"]');
- this.$from.on('change', function () {
+ this.$from.on('change', () => {
this.trigger('change');
- }.bind(this));
- this.$to.on('change', function () {
+ });
+
+ this.$to.on('change', () => {
this.trigger('change');
- }.bind(this));
+ });
}
},
validateRequired: function () {
- var validate = function (name) {
+ var validate = (name) => {
if (this.model.isRequired(name)) {
if (this.model.get(name) === null) {
var msg = this.translate('fieldIsRequired', 'messages').replace('{field}', this.getLabelText());
+
this.showValidationMessage(msg, '[data-name="'+name+'"]');
+
return true;
}
}
- }.bind(this);
+ };
var result = false;
+
result = validate(this.fromField) || result;
result = validate(this.toField) || result;
+
return result;
},
validateInt: function () {
- var validate = function (name) {
+ var validate = (name) => {
if (isNaN(this.model.get(name))) {
var msg = this.translate('fieldShouldBeInt', 'messages').replace('{field}', this.getLabelText());
+
this.showValidationMessage(msg, '[data-name="'+name+'"]');
+
return true;
}
- }.bind(this);
+ };
var result = false;
+
result = validate(this.fromField) || result;
result = validate(this.toField) || result;
+
return result;
},
validateRange: function () {
- var validate = function (name) {
+ var validate = (name) => {
var value = this.model.get(name);
if (value === null) {
@@ -150,34 +170,45 @@ Espo.define('views/fields/range-int', ['views/fields/base', 'views/fields/int'],
if (minValue !== null && maxValue !== null) {
if (value < minValue || value > maxValue ) {
- var msg = this.translate('fieldShouldBeBetween', 'messages').replace('{field}', this.translate(name, 'fields', this.model.name))
- .replace('{min}', minValue)
- .replace('{max}', maxValue);
+ var msg = this.translate('fieldShouldBeBetween', 'messages')
+ .replace('{field}', this.translate(name, 'fields', this.model.name))
+ .replace('{min}', minValue)
+ .replace('{max}', maxValue);
+
this.showValidationMessage(msg, '[data-name="'+name+'"]');
+
return true;
}
} else {
if (minValue !== null) {
if (value < minValue) {
- var msg = this.translate('fieldShouldBeLess', 'messages').replace('{field}', this.translate(name, 'fields', this.model.name))
- .replace('{value}', minValue);
+ var msg = this.translate('fieldShouldBeLess', 'messages')
+ .replace('{field}', this.translate(name, 'fields', this.model.name))
+ .replace('{value}', minValue);
+
this.showValidationMessage(msg, '[data-name="'+name+'"]');
+
return true;
}
} else if (maxValue !== null) {
if (value > maxValue) {
- var msg = this.translate('fieldShouldBeGreater', 'messages').replace('{field}', this.translate(name, 'fields', this.model.name))
- .replace('{value}', maxValue);
+ var msg = this.translate('fieldShouldBeGreater', 'messages')
+ .replace('{field}', this.translate(name, 'fields', this.model.name))
+ .replace('{value}', maxValue);
+
this.showValidationMessage(msg, '[data-name="'+name+'"]');
+
return true;
}
}
}
- }.bind(this);
+ };
var result = false;
+
result = validate(this.fromField) || result;
result = validate(this.toField) || result;
+
return result;
},
@@ -187,10 +218,12 @@ Espo.define('views/fields/range-int', ['views/fields/base', 'views/fields/int'],
if (fromValue !== null && toValue !== null) {
if (fromValue > toValue) {
- var msg = this.translate('fieldShouldBeGreater', 'messages').replace('{field}', this.translate(this.toField, 'fields', this.model.name))
- .replace('{value}', this.translate(this.fromField, 'fields', this.model.name));
+ var msg = this.translate('fieldShouldBeGreater', 'messages')
+ .replace('{field}', this.translate(this.toField, 'fields', this.model.name))
+ .replace('{value}', this.translate(this.fromField, 'fields', this.model.name));
this.showValidationMessage(msg, '[data-name="'+this.fromField+'"]');
+
return true;
}
}
@@ -198,7 +231,7 @@ Espo.define('views/fields/range-int', ['views/fields/base', 'views/fields/int'],
isRequired: function () {
return this.model.getFieldParam(this.fromField, 'required') ||
- this.model.getFieldParam(this.toField, 'required');
+ this.model.getFieldParam(this.toField, 'required');
},
parse: function (value) {
@@ -207,16 +240,16 @@ Espo.define('views/fields/range-int', ['views/fields/base', 'views/fields/int'],
formatNumber: function (value) {
return value;
- return Int.prototype.formatNumber.call(this, value);
+ //return Int.prototype.formatNumber.call(this, value);
},
fetch: function (form) {
var data = {};
+
data[this.fromField] = this.parse(this.$from.val().trim());
data[this.toField] = this.parse(this.$to.val().trim());
- return data;
- }
+ return data;
+ },
});
});
-
diff --git a/client/src/views/modals/related-list.js b/client/src/views/modals/related-list.js
index c20e3a00db..b6d597ce6c 100644
--- a/client/src/views/modals/related-list.js
+++ b/client/src/views/modals/related-list.js
@@ -119,6 +119,30 @@ define('views/modals/related-list', ['views/modal', 'search-manager'], function
this.collection.fetch();
});
+ // Sync changing models.
+ this.listenTo(this.panelCollection, 'change', (m, o) => {
+ // Prevent change after save.
+ if (o.xhr || !m.id) {
+ return;
+ }
+
+ let model = this.collection.get(m.id);
+
+ if (!model) {
+ return;
+ }
+
+ let attributes = {};
+
+ for (let name in m.attributes) {
+ if (m.hasChanged(name)) {
+ attributes[name] = m.attributes[name];
+ }
+ }
+
+ model.set(attributes);
+ });
+
if (this.model) {
this.listenTo(this.model, 'after:unrelate', () => {
this.panelCollection.fetch({
diff --git a/client/src/views/record/list-tree.js b/client/src/views/record/list-tree.js
index 82ef873c08..2451644264 100644
--- a/client/src/views/record/list-tree.js
+++ b/client/src/views/record/list-tree.js
@@ -95,6 +95,8 @@ define('views/record/list-tree', 'views/record/list', function (Dep) {
data.showRootMenu = false;
}
+ data.noData = data.createDisabled && !data.rowList.length && !data.showRoot;
+
return data;
},
diff --git a/composer.json b/composer.json
index 6f5a8c01e2..901e061fb4 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"homepage": "https://github.com/espocrm/espocrm.git",
"license": "GPL-3.0-only",
"require": {
- "php": ">=7.4.0",
+ "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
"ext-pdo_mysql": "*",
"ext-openssl": "*",
"ext-json": "*",
diff --git a/package-lock.json b/package-lock.json
index efd092f0f0..2695cf0874 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "espocrm",
- "version": "7.1.5",
+ "version": "7.1.6",
"lockfileVersion": 2,
"requires": true,
"packages": {
diff --git a/package.json b/package.json
index fa576d1e57..b7cf46e87d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "espocrm",
- "version": "7.1.5",
+ "version": "7.1.6",
"description": "Open-source CRM.",
"repository": {
"type": "git",