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

Merge pull request #746 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-03-18 16:37:56 +03:00 committed by GitHub
parent 1da3ef45f3 1c527c76f5
commit f63232b2e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -715,6 +715,18 @@ define([
if ( lock ) if ( lock )
$btnUsers.addClass('disabled').attr('disabled', 'disabled'); else $btnUsers.addClass('disabled').attr('disabled', 'disabled'); else
$btnUsers.removeClass('disabled').attr('disabled', ''); $btnUsers.removeClass('disabled').attr('disabled', '');
} else if ( alias == 'rename-user' ) {
if (me.labelUserName) {
if ( lock ) {
me.labelUserName.removeClass('clickable');
me.labelUserName.addClass('disabled');
} else {
me.labelUserName.addClass('clickable');
me.labelUserName.removeClass('disabled');
}
} else if (me.btnUserName) {
me.btnUserName.setDisabled(lock);
}
} else { } else {
var _lockButton = function (btn) { var _lockButton = function (btn) {
if ( btn ) { if ( btn ) {

10
apps/documenteditor/main/app/controller/Main.js
View file

@ -571,6 +571,7 @@ define([
appHeader.getButton('users') && appHeader.getButton('users').hide(); appHeader.getButton('users') && appHeader.getButton('users').hide();
this.getApplication().getController('LeftMenu').getView('LeftMenu').showHistory(); this.getApplication().getController('LeftMenu').getView('LeftMenu').showHistory();
this.disableEditing(true); this.disableEditing(true);
this._renameDialog && this._renameDialog.close();
var versions = opts.data.history, var versions = opts.data.history,
historyStore = this.getApplication().getCollection('Common.Collections.HistoryVersions'), historyStore = this.getApplication().getCollection('Common.Collections.HistoryVersions'),
currentVersion = null; currentVersion = null;
@ -589,7 +590,7 @@ define([
if (!user) { if (!user) {
user = new Common.Models.User({ user = new Common.Models.User({
id : version.user.id, id : version.user.id,
username : version.user.name, username : version.user.name || this.textAnonymous,
colorval : Asc.c_oAscArrUserColors[usersCnt], colorval : Asc.c_oAscArrUserColors[usersCnt],
color : this.generateUserColor(Asc.c_oAscArrUserColors[usersCnt++]) color : this.generateUserColor(Asc.c_oAscArrUserColors[usersCnt++])
}); });
@ -600,7 +601,7 @@ define([
version: version.versionGroup, version: version.versionGroup,
revision: version.version, revision: version.version,
userid : version.user.id, userid : version.user.id,
username : version.user.name, username : version.user.name || this.textAnonymous,
usercolor: user.get('color'), usercolor: user.get('color'),
created: version.created, created: version.created,
docId: version.key, docId: version.key,
@ -637,7 +638,7 @@ define([
if (!user) { if (!user) {
user = new Common.Models.User({ user = new Common.Models.User({
id : change.user.id, id : change.user.id,
username : change.user.name, username : change.user.name || this.textAnonymous,
colorval : Asc.c_oAscArrUserColors[usersCnt], colorval : Asc.c_oAscArrUserColors[usersCnt],
color : this.generateUserColor(Asc.c_oAscArrUserColors[usersCnt++]) color : this.generateUserColor(Asc.c_oAscArrUserColors[usersCnt++])
}); });
@ -649,7 +650,7 @@ define([
revision: version.version, revision: version.version,
changeid: i, changeid: i,
userid : change.user.id, userid : change.user.id,
username : change.user.name, username : change.user.name || this.textAnonymous,
usercolor: user.get('color'), usercolor: user.get('color'),
created: change.created, created: change.created,
docId: version.key, docId: version.key,
@ -701,6 +702,7 @@ define([
app.getController('LeftMenu').SetDisabled(disable, true); app.getController('LeftMenu').SetDisabled(disable, true);
app.getController('Toolbar').DisableToolbar(disable, disable); app.getController('Toolbar').DisableToolbar(disable, disable);
app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable); app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
app.getController('Viewport').SetDisabled(disable);
}, },
goBack: function(current) { goBack: function(current) {

5
apps/documenteditor/main/app/controller/Viewport.js
View file

@ -411,9 +411,14 @@ define([
this.header.btnPrint.hide(); this.header.btnPrint.hide();
if (this.header.btnEdit) if (this.header.btnEdit)
this.header.btnEdit.hide(); this.header.btnEdit.hide();
this.header.lockHeaderBtns( 'rename-user', true);
} }
}, },
SetDisabled: function(disable) {
this.header && this.header.lockHeaderBtns( 'rename-user', disable);
},
textFitPage: 'Fit to Page', textFitPage: 'Fit to Page',
textFitWidth: 'Fit to Width' textFitWidth: 'Fit to Width'
}, DE.Controllers.Viewport)); }, DE.Controllers.Viewport));