Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2157 from ONLYOFFICE/fix/bug-58695

Browse source 
For Bug 58695
This commit is contained in:
Julia Radzhabova 2022-12-22 13:12:49 +03:00 committed by GitHub
parent 96d7299b46 f84d47e2bc
commit c85b422820
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/main/lib/view/Header.js
View file

@ -152,7 +152,7 @@ define([
function onResetUsers(collection, opts) { function onResetUsers(collection, opts) {
var usercount = collection.getVisibleEditingCount(); var usercount = collection.getVisibleEditingCount();
if ( $userList ) { if ( $userList ) {
if (usercount > 1 && appConfig && (appConfig.isEdit || appConfig.isRestrictedEdit)) { if (appConfig && (usercount > 1 && (appConfig.isEdit || appConfig.isRestrictedEdit) || usercount >0 && appConfig.canLiveView)) {
$userList.html(templateUserList({ $userList.html(templateUserList({
users: collection.chain().filter(function(item){return item.get('online') && !item.get('view') && !item.get('hidden')}).groupBy(function(item) {return item.get('idOriginal');}).value(), users: collection.chain().filter(function(item){return item.get('online') && !item.get('view') && !item.get('hidden')}).groupBy(function(item) {return item.get('idOriginal');}).value(),
usertpl: _.template(templateUserItem), usertpl: _.template(templateUserItem),
@ -182,8 +182,7 @@ define([
function applyUsers(count, originalCount) { function applyUsers(count, originalCount) {
if (!$btnUsers) return; if (!$btnUsers) return;
var has_edit_users = appConfig && (count > 1 && (appConfig.isEdit || appConfig.isRestrictedEdit) || count > 0 && appConfig.canLiveView); // has other user(s) who edit document
var has_edit_users = count > 1 && appConfig && (appConfig.isEdit || appConfig.isRestrictedEdit); // has other user(s) who edit document
if ( has_edit_users ) { if ( has_edit_users ) {
$panelUsers['show'](); $panelUsers['show']();
$btnUsers.find('.caption').html(originalCount); $btnUsers.find('.caption').html(originalCount);
@ -316,7 +315,7 @@ define([
html: true html: true
}); });
$btnUsers.on('click', onUsersClick.bind(me)); $btnUsers.on('click', onUsersClick.bind(me));
$panelUsers[(editingUsers > 1 && appConfig && (appConfig.isEdit || appConfig.isRestrictedEdit)) ? 'show' : 'hide'](); $panelUsers[(appConfig && (editingUsers > 1 && (appConfig.isEdit || appConfig.isRestrictedEdit) || editingUsers > 0 && appConfig.canLiveView)) ? 'show' : 'hide']();
updateDocNamePosition(appConfig); updateDocNamePosition(appConfig);
} }