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

Merge pull request 'fix/forms-8.3.3' (#350) from fix/forms-8.3.3 into hotfix/v8.3.3

Browse Source
This commit is contained in:
Julia Radzhabova
2025-03-24 13:46:49 +00:00
parent 5255c27b1a 535550b6ea
commit 2f94271f62
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci-build-upload.yml vendored
View File

@ -69,7 +69,7 @@ jobs:
- name: Upload artifact
if: steps.apps-files.outcome == 'success'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: apps-artifact
path: apps.tar
@ -82,7 +82,7 @@ jobs:
steps:
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: apps-artifact

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

@ -1377,6 +1377,7 @@ define([
me.api.asc_registerCallback('asc_onEndAction', _.bind(me.onLongActionEnd, me));
me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(me.onCoAuthoringDisconnect, me));
me.api.asc_registerCallback('asc_onDisconnectEveryone', _.bind(me.onDisconnectEveryone, me));
me.api.asc_registerCallback('asc_onCompletePreparingOForm', _.bind(me.onCompletePreparingOForm, me));
me.api.asc_registerCallback('asc_onPrint', _.bind(me.onPrint, me));
me.api.asc_registerCallback('asc_onConfirmAction', _.bind(me.onConfirmAction, me));
@ -1960,6 +1961,9 @@ define([
msg : this.warnStartFilling,
buttons: ['ok']
});
},
onCompletePreparingOForm: function() {
Common.Gateway.startFilling();
},

12
apps/documenteditor/mobile/src/controller/Main.jsx
View File

@ -444,11 +444,13 @@ class MainController extends Component {
let oform = this.api.asc_GetOForm();
let role = new AscCommon.CRestrictionSettings();
const _userOptions = this.props.storeAppOptions.user;
if (oform && _userOptions && _userOptions.roles && _userOptions.roles.length>0 && oform.asc_canFillRole(_userOptions.roles[0])) {
role.put_OFormRole(_userOptions.roles[0]);
} else {
role.put_OFormNoRole(true);
Common.Notifications.trigger('toolbar:deactivateeditcontrols');
if (oform && _userOptions && _userOptions.roles) {
if (_userOptions.roles.length>0 && oform.asc_canFillRole(_userOptions.roles[0])) {
role.put_OFormRole(_userOptions.roles[0]);
} else {
role.put_OFormNoRole(true);
Common.Notifications.trigger('toolbar:deactivateeditcontrols');
}
}
this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms, role);
}