espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix'

Browse Source
This commit is contained in:
Yuri Kuznetsov
2025-11-14 15:26:30 +02:00
parent 0a69f46e14 5ce2e0b6dc
commit 804c9622a6
19 changed files with 100 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Modules/Crm/Resources/layouts/Contact/listSelect.json
+1 -1
View File
@@ -1,5 +1,5 @@
[
{"name":"name","link":true, "width": "40"},
{"name":"name", "link":true, "width": 40},
{"name":"account"},
{"name":"emailAddress", "notSortable": true}
]
application/Espo/Resources/layouts/ActionHistoryRecord/listSmall.json
+4 -4
View File
@@ -1,6 +1,6 @@
[
{"name":"action", "width": "18", "notSortable": true},
{"name":"targetType", "width": "20", "notSortable": true},
{"name":"action", "width": 18, "notSortable": true},
{"name":"targetType", "width": 20, "notSortable": true},
{"name":"target", "notSortable": true},
{"name":"createdAt", "width": "18", "align": "right", "notSortable": true}
]
{"name":"createdAt", "width": 18, "align": "right", "notSortable": true}
]
application/Espo/Resources/layouts/AuthToken/list.json
+4 -4
View File
@@ -1,7 +1,7 @@
[
{"name":"user"},
{"name":"isActive", "widthPx": "100"},
{"name":"ipAddress", "width": "17"},
{"name":"createdAt", "width": "19"},
{"name":"lastAccess", "width": "19"}
{"name":"isActive", "widthPx": 100},
{"name":"ipAddress", "width": 17},
{"name":"createdAt", "width": 19},
{"name":"lastAccess", "width": 19}
]
application/Espo/Resources/layouts/AuthToken/listSmall.json
+4 -4
View File
@@ -1,7 +1,7 @@
[
{"name":"user"},
{"name":"isActive", "widthPx": "100"},
{"name":"ipAddress", "width": "17"},
{"name":"createdAt", "width": "19"},
{"name":"lastAccess", "width": "19"}
{"name":"isActive", "widthPx": 100},
{"name":"ipAddress", "width": 17},
{"name":"createdAt", "width": 19},
{"name":"lastAccess", "width": 19}
]
application/Espo/Resources/layouts/LeadCaptureLogRecord/listForLeadCapture.json
+2 -2
View File
@@ -1,5 +1,5 @@
[
{"name":"target", "notSortable": true},
{"name":"isCreated", "width": "25", "notSortable": true},
{"name":"createdAt", "width": "30", "notSortable": true}
{"name":"isCreated", "width": 25, "notSortable": true},
{"name":"createdAt", "width": 30, "notSortable": true}
]
application/Espo/Tools/Stream/UserRecordService.php
+1 -1
View File
@@ -389,7 +389,7 @@ class UserRecordService
[
'entityType:' => 'parentType',
'entityId:' => 'parentId',
'subscription.userId' => $user->getId(),
'subscriptionExclude.userId' => $user->getId(),
]
)
->where([
client/res/templates/record/search.tpl
+1 -1
View File
@@ -34,7 +34,7 @@
data-action="selectPreset"
>
<div class="{{#if style}}text-{{style}}{{/if}}">
{{#if label}}{{label}}{{else}}{{translate name category='presetFilters' scope=../entityType}}{{/if}}
{{~#if label}}{{label}}{{else}}{{translate name category='presetFilters' scope=../entityType}}{{/if~}}
</div>
</a>
</li>
client/src/collection.js
+1 -1
View File
@@ -174,7 +174,7 @@ class Collection {
parentModel
/**
* @param {Model[]|null} [models] Models.
* @param {Model[]|Record<string, *>[]|null} [models] Models.
* @param {{
* entityType?: string,
* model?: Model.prototype,
client/src/views/email/fields/email-address-varchar.js
+33 -2
View File
@@ -420,7 +420,38 @@ class EmailAddressVarcharFieldView extends BaseFieldView {
return true;
}
/**
*
* @param {string} address
* @param {string} name
* @param {string} [type]
* @param {string} [id]
*/
addAddress(address, name, type, id) {
if (name === '') {
const nameHash = this.model.attributes.nameHash ?? {};
if (address in nameHash) {
name = nameHash[address];
}
}
if (type === undefined) {
const typeHash = this.model.attributes.typeHash ?? {};
if (address in typeHash) {
type = typeHash[address];
}
}
if (id === undefined) {
const idHash = this.model.attributes.idHash ?? {};
if (address in idHash) {
id = idHash[address];
}
}
if (this.justAddedAddress) {
this.deleteAddress(this.justAddedAddress);
}
@@ -482,9 +513,9 @@ class EmailAddressVarcharFieldView extends BaseFieldView {
$text.append(
$('<span>').text(name),
' ',
'<span class="no-select"> </span>',
$('<span>').addClass('text-muted middle-dot'),
' '
'<span class="no-select"> </span>'
);
}
client/src/views/fields/array.js
+4
View File
@@ -256,6 +256,10 @@ class ArrayFieldView extends BaseFieldView {
this.allowCustomOptions = true;
}
if (this.params.allowCustomOptions === false) {
this.allowCustomOptions = false;
}
if (this.type === 'array') {
this.validations.push('noInputValue')
}
client/src/views/fields/link.js
+28 -9
View File
@@ -217,6 +217,13 @@ class LinkFieldView extends BaseFieldView {
*/
linkClass
/**
* @protected
* @type {string}
* @since 9.2.5
*/
foreignNameAttribute
/** @inheritDoc */
events = {
/** @this LinkFieldView */
@@ -364,6 +371,10 @@ class LinkFieldView extends BaseFieldView {
this.model.getFieldParam(this.name, 'entity') ||
this.model.getLinkParam(this.name, 'entity');
this.foreignNameAttribute = this.model.getLinkParam(this.name, 'foreignName') ??
this.getMetadata().get(`clientDefs.${this.foreignScope}.nameAttribute`) ??
'name';
if ('createDisabled' in this.options) {
this.createDisabled = this.options.createDisabled;
}
@@ -407,12 +418,12 @@ class LinkFieldView extends BaseFieldView {
* @return {Promise|void}
*/
select(model) {
this.$elementName.val(model.get('name') || model.id);
this.$elementId.val(model.get('id'));
this.$elementName.val(model.get(this.foreignNameAttribute) || model.id);
this.$elementId.val(model.id);
if (this.mode === this.MODE_SEARCH) {
this.searchData.idValue = model.get('id');
this.searchData.nameValue = model.get('name') || model.id;
this.searchData.idValue = model.id;
this.searchData.nameValue = model.get(this.foreignNameAttribute) || model.id;
}
this.trigger('change');
@@ -611,7 +622,7 @@ class LinkFieldView extends BaseFieldView {
if (!this.forceSelectAllAttributes) {
const mandatorySelectAttributeList = this.getMandatorySelectAttributeList();
let select = ['id', 'name'];
let select = ['id', this.foreignNameAttribute];
if (mandatorySelectAttributeList) {
select = select.concat(mandatorySelectAttributeList);
@@ -824,12 +835,20 @@ class LinkFieldView extends BaseFieldView {
const list = [];
response.list.forEach(item => {
const name = item[this.foreignNameAttribute] || item.name || item.id;
const attributes = item;
if (this.foreignNameAttribute !== 'name') {
attributes[this.foreignNameAttribute] = name;
}
list.push({
id: item.id,
name: item.name || item.id,
name: name,
data: item.id,
value: item.name || item.id,
attributes: item,
value: name,
attributes: attributes,
});
});
@@ -1365,7 +1384,7 @@ class LinkFieldView extends BaseFieldView {
*/
selectOneOf(models) {
models.forEach(model => {
this.addLinkOneOf(model.id, model.get('name'));
this.addLinkOneOf(model.id, model.get(this.foreignNameAttribute));
});
}
}
client/src/views/record/edit.js
+5 -1
View File
@@ -148,7 +148,11 @@ class EditRecordView extends DetailRecordView {
this.wait(promise);
// @todo Revise. Possible race condition issues.
promise.then(() => super.setupBeforeFinal());
promise.then(() => {
super.setupBeforeFinal();
this.processDynamicLogic();
});
}
if (this.model.isNew()) {
client/src/views/record/search.js
+1 -1
View File
@@ -938,7 +938,7 @@ class SearchView extends View {
this.$el
.find('ul.filter-menu a.preset[data-name="'+presetName+'"]')
.prepend('<span class="fas fa-check pull-right"></span>');
.prepend('<span class="fas fa-check check-icon pull-right"></span>');
}
manageBoolFilters() {
frontend/less/espo/custom.less
+1 -1
View File
@@ -112,7 +112,7 @@ img.image-preview {
.preset {
text-overflow: ellipsis;
overflow: hidden !important;
//overflow: hidden !important;
}
.preset > div{
frontend/less/espo/elements/dropdown.less
+2
View File
@@ -8,6 +8,8 @@
padding: var(--5px) 0;
user-select: none;
min-width: calc(var(--50px) + var(--10px));
.autocomplete-suggestion.autocomplete-selected {
background-color: var(--dropdown-link-hover-bg) !important;
color: var(--dropdown-link-hover-color) !important;
frontend/less/espo/elements/type.less
+4
View File
@@ -213,6 +213,10 @@ small,
top: var(--minus-1px);
}
.no-select {
user-select: none;
}
a[role="button"],
a[href="javascript:"] {
&:not(.selectable) {
package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "espocrm",
"version": "9.2.4",
"version": "9.2.5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "espocrm",
"version": "9.2.4",
"version": "9.2.5",
"hasInstallScript": true,
"license": "AGPL-3.0-or-later",
"dependencies": {
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "espocrm",
"version": "9.2.4",
"version": "9.2.5",
"description": "Open-source CRM.",
"repository": {
"type": "git",
schema/metadata/app/webSocket.json
+1 -1
View File
@@ -19,7 +19,7 @@
},
"accessCheckCommand": {
"type": "string",
"description": "A console command that will be used to check whether a topic is allowed for a user when they attempting to subscribe. Patameter placeholders starts with the colon :. The userId parameter contains a user ID. If access checking is not needed, omit this parameter."
"description": "A console command that will be used to check whether a topic is allowed for a user when they attempting to subscribe. Parameter placeholders starts with the colon :. The userId parameter contains a user ID. If access checking is not needed, omit this parameter."
}
}
}