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

Merge pull request #2163 from ONLYOFFICE/fix/de-protect

Browse source 
[DE] Fix protection: enable all protect options regardless of permiss…
This commit is contained in:
Julia Radzhabova 2022-12-23 17:05:29 +03:00 committed by GitHub
parent 2325c1c767 49bbb8c2ef
commit e06b4344bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1053,12 +1053,13 @@ define([
Common.Utils.lockControls(Common.enumLock.docLockReview, props.isReviewOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
Common.Utils.lockControls(Common.enumLock.docLockComments, props.isCommentsOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
}
if (this.appConfig.canReview) {
if (!this.appConfig.isReviewOnly) {
// protection in document is more important than permissions.review, call asc_SetLocalTrackRevisions even if canReview is false
if (props.isReviewOnly) {
this.onTurnPreview(true);
this.api.asc_SetLocalTrackRevisions(true);
this.onApiShowChange();
} else if (this._state.prevReviewProtected) {
this.onTurnPreview(false);
this.api.asc_SetLocalTrackRevisions(false);
this.onApiShowChange();
}
this._state.prevReviewProtected = props.isReviewOnly;

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

@ -1547,7 +1547,7 @@ define([
this.appOptions.canEditContentControl = (this.permissions.modifyContentControl!==false);
this.appOptions.canHelp = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
this.appOptions.canSubmitForms = false; // this.appOptions.canLicense && (typeof (this.editorConfig.customization) == 'object') && !!this.editorConfig.customization.submitForm;
this.appOptions.canFillForms = this.appOptions.canLicense && ((this.permissions.fillForms===undefined) ? this.appOptions.isEdit : this.permissions.fillForms) && (this.editorConfig.mode !== 'view');
this.appOptions.canFillForms = this.appOptions.canLicense && (this.appOptions.isEdit ? true : this.permissions.fillForms) && (this.editorConfig.mode !== 'view');
this.appOptions.isRestrictedEdit = !this.appOptions.isEdit && (this.appOptions.canComments || this.appOptions.canFillForms);
if (this.appOptions.isRestrictedEdit && this.appOptions.canComments && this.appOptions.canFillForms) // must be one restricted mode, priority for filling forms
this.appOptions.canComments = false;

3
apps/documenteditor/main/app/view/ProtectDialog.js
View file

@ -201,9 +201,6 @@ define([
_setDefaults: function (props) {
if (props) {
this.rbReview.setDisabled(!props.canReview);
this.rbForms.setDisabled(!props.canFillForms);
this.rbComments.setDisabled(!props.canComments);
}
},