pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-23 20:20:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/bugfix' (#728) from fix/bugfix into release/v9.1.0

Browse Source
This commit is contained in:
Julia Radzhabova
2025-09-26 19:24:37 +00:00
parent a27b717aff 30ca304d31
commit dfd3cc9602
6 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/documenteditor/forms/app/controller/ApplicationController.js
View File

@ -984,7 +984,7 @@ define([
}
this.submitedTooltip.show();
}
this.api.asc_setRestriction(Asc.c_oAscRestrictionType.View);
this.api.asc_setRestriction(Asc.c_oAscRestrictionType.View, this.api.asc_getRestrictionSettings());
this.onApiServerDisconnect(true);
} else
this.disableFillingForms(false);

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

@ -1963,7 +1963,7 @@ define([
} else if (mode==='review') {
Common.NotificationCenter.trigger('reviewchanges:turn', true);
}
this.api.asc_setRestriction(mode==='view' ? Asc.c_oAscRestrictionType.View : mode==='view-form' ? Asc.c_oAscRestrictionType.OnlyForms : Asc.c_oAscRestrictionType.None);
this.api.asc_setRestriction(mode==='view' ? Asc.c_oAscRestrictionType.View : mode==='view-form' ? Asc.c_oAscRestrictionType.OnlyForms : Asc.c_oAscRestrictionType.None, this.api.asc_getRestrictionSettings());
}
(!inViewMode || force) && Common.NotificationCenter.trigger('doc:mode-changed', mode);
},

1
apps/documenteditor/main/app/view/Toolbar.js
View File

@ -666,6 +666,7 @@ define([
id: 'id-toolbar-btn-direction',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-ltr',
icls: 'btn-ltr',
action: 'text-direction',
dirRtl: false,
lock: [_set.noParagraphSelected, _set.paragraphLock, _set.headerLock, _set.richEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockViewPara, _set.docLockForms, _set.docLockCommentsPara, _set.fixedForm, _set.viewMode],

1
apps/pdfeditor/main/app/view/Toolbar.js
View File

@ -692,6 +692,7 @@ define([
id: 'id-toolbar-btn-direction',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-ltr',
icls: 'btn-ltr',
action: 'text-direction',
dirRtl: false,
lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inCheckForm, _set.disableOnStart, _set.inAnnotation],

1
apps/presentationeditor/main/app/view/Toolbar.js
View File

@ -914,6 +914,7 @@ define([
id: 'id-toolbar-btn-direction',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-ltr',
icls: 'btn-ltr',
action: 'text-direction',
dirRtl: false,
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected, _set.noParagraphObject],

1
apps/spreadsheeteditor/main/app/view/Toolbar.js
View File

@ -799,6 +799,7 @@ define([
id: 'id-toolbar-btn-direction',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-ltr',
icls: 'btn-ltr',
action: 'text-direction',
lock: [_set.editCell, _set.selChart, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.coAuthText, _set.wsLockFormat, _set.userProtected],
menu: new Common.UI.Menu({