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

[DE] Fix lock combine button

Browse source
This commit is contained in:
Julia Radzhabova 2022-12-22 13:30:16 +03:00
parent 8ca27b4c36
commit 4d4f04f197
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1045,7 +1045,7 @@ define([
if (!item.asc_getView()) if (!item.asc_getView())
length++; length++;
}); });
Common.Utils.lockControls(Common.enumLock.hasCoeditingUsers, length>1, {array: [this.view.btnCompare]}); Common.Utils.lockControls(Common.enumLock.hasCoeditingUsers, length>1, {array: [this.view.btnCompare, this.view.btnCombine]});
} }
}, },

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

@ -310,7 +310,7 @@ define([
caption: this.txtCombine, caption: this.txtCombine,
split: true, split: true,
iconCls: 'toolbar__icon combine', iconCls: 'toolbar__icon combine',
lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect], lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small' dataHintOffset: 'small'