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

Merge pull request #1410 from ONLYOFFICE/fix/bugfix

Browse source 
[DE] Bug 54504
This commit is contained in:
Julia Radzhabova 2021-12-13 20:55:50 +03:00 committed by GitHub
parent bb7069283f ffadd710c4
commit 54246a92a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -210,6 +210,7 @@ define([
this.dlgChanges.btnReject.setDisabled(btnlock);
}
this._state.lock = btnlock;
Common.Utils.InternalSettings.set(this.view.appPrefix + "accept-reject-lock", btnlock);
}
this._state.posx = posX;
this._state.posy = posY;

11
apps/common/main/lib/view/ReviewChanges.js
View file

@ -524,8 +524,8 @@ define([
me.btnCompare.updateHint(me.tipCompare);
}
me.btnAccept.setDisabled(config.isReviewOnly);
me.btnReject.setDisabled(config.isReviewOnly);
config.isReviewOnly && me.btnAccept.setDisabled(true);
config.isReviewOnly && me.btnReject.setDisabled(true);
}
if (me.appConfig.canViewReview) {
me.btnPrev.updateHint(me.hintPrev);
@ -946,6 +946,9 @@ define([
this.popoverChanges = this.options.popoverChanges;
this.mode = this.options.mode;
var filter = Common.localStorage.getKeysFilter();
this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -972,7 +975,7 @@ define([
cls : 'btn-toolbar',
caption : this.txtAccept,
split : true,
disabled : this.mode.isReviewOnly,
disabled : this.mode.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
menu : this.mode.canUseReviewPermissions ? false : new Common.UI.Menu({
items: [
this.mnuAcceptCurrent = new Common.UI.MenuItem({
@ -992,7 +995,7 @@ define([
cls : 'btn-toolbar',
caption : this.txtReject,
split : true,
disabled : this.mode.isReviewOnly,
disabled : this.mode.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
menu : this.mode.canUseReviewPermissions ? false : new Common.UI.Menu({
items: [
this.mnuRejectCurrent = new Common.UI.MenuItem({