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([