Merge pull request #2864 from ONLYOFFICE/fix/bugfix

[SSE] Show avatars for protected ranges
ONLYOFFICE · Feb 27, 2024 · e9c02cd · e9c02cd
2 parents efa9510 + ef72ef1
commit e9c02cd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/apps/spreadsheeteditor/main/app/view/ProtectedRangesEditDlg.js b/apps/spreadsheeteditor/main/app/view/ProtectedRangesEditDlg.js
@@ -367,7 +367,7 @@ define([
                         name: record.displayValue,
                         displayName: record.displayValue,
                         initials: Common.Utils.getUserInitials(record.displayValue),
-                        avatar: Common.UI.ExternalUsers.getImage(value),
+                        avatar: Common.UI.ExternalUsers.getImage(value) || record.image || '',
                         usercolor: Common.UI.ExternalUsers.getColor(value),
                         email: record.value,
                         type: Asc.c_oSerUserProtectedRangeType.edit
@@ -419,6 +419,7 @@ define([
                         rec.name && item.set('name', rec.name);
                         rec.name && item.set('displayName', rec.name);
                         rec.email && item.set('email', rec.email);
+                        rec.image && item.set('avatar', rec.image);
                     }
                 });
                 this._initSettings = false;
@@ -441,8 +442,12 @@ define([
                         value: item.email || '',
                         displayValue: item.name || '',
                         userId: item.id,
+                        image: item.image,
                         hasDivider: !item.hasAccess && !divider && (index>0)
                     });
+                    if (item.image && !Common.UI.ExternalUsers.getImage(item.id)) {
+                        Common.UI.ExternalUsers.setImage(item.id, item.image);
+                    }
                     if (!item.hasAccess)
                         divider = true;
                 });