From c26cb6eecb6b65e9ebd9bfbaa0813606d3342abd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 5 Sep 2024 12:05:01 +0300 Subject: [PATCH] Fix colors for users with empty id --- apps/common/main/lib/controller/Comments.js | 2 +- apps/common/main/lib/controller/ReviewChanges.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 35d51f7e1e..2b0471ee10 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -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; diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 19854d59d4..ae88549146 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -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')); }); },