pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 04:45:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bug 71647

Browse Source
This commit is contained in:
Julia Radzhabova
2025-01-17 17:33:54 +03:00
parent de96538ba3
commit f9b451fefc
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/common/main/lib/view/ReviewPopover.js
View File

@ -1266,7 +1266,17 @@ define([
str = str.toLowerCase();
if (str.length>0) {
users = _.filter(users, function(item) {
return (item.email && 0 === item.email.toLowerCase().indexOf(str) || item.name && 0 === item.name.toLowerCase().indexOf(str))
if (item.email && 0 === item.email.toLowerCase().indexOf(str)) return true;
let arr = item.name ? item.name.toLowerCase().split(' ') : [],
inName = false;
for (let i=0; i<arr.length; i++) {
if (0 === arr[i].indexOf(str)) {
inName = true;
break;
}
}
return inName;
});
}
var tpl = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem">' +

14
apps/spreadsheeteditor/main/app/view/ProtectedRangesEditDlg.js
View File

@ -428,8 +428,18 @@ define([], function () {
if (users && users.length>0) {
var strlc = str.toLowerCase();
users = _.filter(users, function(item) {
return (item.id !== undefined && item.id !== null) &&
(!strlc || item.email && 0 === item.email.toLowerCase().indexOf(strlc) || item.name && 0 === item.name.toLowerCase().indexOf(strlc));
if ((item.id !== undefined && item.id !== null) &&
(!strlc || item.email && 0 === item.email.toLowerCase().indexOf(strlc))) return true;
let arr = item.name ? item.name.toLowerCase().split(' ') : [],
inName = false;
for (let i=0; i<arr.length; i++) {
if (0 === arr[i].indexOf(strlc)) {
inName = true;
break;
}
}
return (item.id !== undefined && item.id !== null) && inName;
});
var divider = false;
_.each(users, function(item, index) {