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

Fix colors for users with empty id

Browse Source
This commit is contained in:
Julia Radzhabova
2024-09-05 12:05:01 +03:00
parent c83799e6db
commit c26cb6eecb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/main/lib/controller/Comments.js
View File

@ -1211,7 +1211,7 @@ define([
var users = this.userCollection,
hasGroup = false,
updateCommentData = function(comment, user, isNotReply) {
var color = (user) ? user.get('color') : Common.UI.ExternalUsers.getColor(comment.get('userid')),
var color = (user) ? user.get('color') : Common.UI.ExternalUsers.getColor(comment.get('userid') || comment.get('username')),
needrender = false;
if (color !== comment.get('usercolor')) {
needrender = true;

2
apps/common/main/lib/controller/ReviewChanges.js
View File

@ -1094,7 +1094,7 @@ define([
var users = this.userCollection;
this.popoverChanges && this.popoverChanges.each(function (model) {
var user = users.findOriginalUser(model.get('userid'));
model.set('usercolor', (user) ? user.get('color') : Common.UI.ExternalUsers.getColor(model.get('userid')));
model.set('usercolor', (user) ? user.get('color') : Common.UI.ExternalUsers.getColor(model.get('userid') || model.get('username')));
user && user.get('avatar') && model.set('avatar', user.get('avatar'));
});
},