Compare commits

..

6 Commits

Author SHA1 Message Date
0d630e749e standardize comments in English 2026-03-30 05:03:45 +00:00
48222ffdc1 Fix bug #80439
Fix export
2026-03-27 17:33:31 +03:00
e318396b71 Merge branch hotfix/v9.3.1 into release/v9.4.0 2026-03-12 15:26:16 +00:00
ab5795e3d9 Fix bug #80439
Fix export for CRoleSettings
2026-03-05 10:41:19 +03:00
a3e6482ff3 Merge branch release/v9.3.0 into develop 2026-02-25 15:15:38 +00:00
cd54c2bdff Merge branch hotfix/v9.2.1 into develop 2025-12-17 15:33:38 +00:00
2 changed files with 15 additions and 14 deletions

View File

@ -733,14 +733,14 @@
//--------------------------------------------------------export----------------------------------------------------
AscOForm.OForm = OForm;
//---------------------------------------------interface export-----------------------------------------------------
OForm.prototype['asc_getAllRoles'] = OForm.prototype.getAllRoles;
OForm.prototype['asc_addRole'] = OForm.prototype.addRole;
OForm.prototype['asc_removeRole'] = OForm.prototype.removeRole;
OForm.prototype['asc_editRole'] = OForm.prototype.editRole;
OForm.prototype['asc_moveUpRole'] = OForm.prototype.moveUpRole;
OForm.prototype['asc_moveDownRole'] = OForm.prototype.moveDownRole;
OForm.prototype['asc_haveRole'] = OForm.prototype.haveRole;
OForm.prototype['asc_getRole'] = OForm.prototype.getRoleSettings;
OForm.prototype['asc_canFillRole'] = OForm.prototype.canFillRole;
OForm.prototype['asc_getAllRoles'] = OForm.prototype.asc_getAllRoles = OForm.prototype.getAllRoles;
OForm.prototype['asc_addRole'] = OForm.prototype.asc_addRole = OForm.prototype.addRole;
OForm.prototype['asc_removeRole'] = OForm.prototype.asc_removeRole = OForm.prototype.removeRole;
OForm.prototype['asc_editRole'] = OForm.prototype.asc_editRole = OForm.prototype.editRole;
OForm.prototype['asc_moveUpRole'] = OForm.prototype.asc_moveUpRole = OForm.prototype.moveUpRole;
OForm.prototype['asc_moveDownRole'] = OForm.prototype.asc_moveDownRole = OForm.prototype.moveDownRole;
OForm.prototype['asc_haveRole'] = OForm.prototype.asc_haveRole = OForm.prototype.haveRole;
OForm.prototype['asc_getRole'] = OForm.prototype.asc_getRole = OForm.prototype.getRoleSettings;
OForm.prototype['asc_canFillRole'] = OForm.prototype.asc_canFillRole = OForm.prototype.canFillRole;
})(window);

View File

@ -164,9 +164,10 @@
//---------------------------------------------interface export-----------------------------------------------------
CRole.prototype['asc_getSettings'] = CRole.prototype.getSettings;
window['AscCommon']["CRoleSettings"] = CRoleSettings;
CRoleSettings.prototype["asc_getName"] = CRoleSettings.prototype.getName;
CRoleSettings.prototype["asc_putName"] = CRoleSettings.prototype.setName;
CRoleSettings.prototype["asc_getColor"] = CRoleSettings.prototype.getAscColor;
CRoleSettings.prototype["asc_putColor"] = CRoleSettings.prototype.setAscColor;
CRoleSettings.prototype["asc_getFieldCount"] = CRoleSettings.prototype.getFieldCount;
window['AscCommon'].CRoleSettings = CRoleSettings;
CRoleSettings.prototype["asc_getName"] = CRoleSettings.prototype.asc_getName = CRoleSettings.prototype.getName;
CRoleSettings.prototype["asc_putName"] = CRoleSettings.prototype.asc_putName = CRoleSettings.prototype.setName;
CRoleSettings.prototype["asc_getColor"] = CRoleSettings.prototype.asc_getColor = CRoleSettings.prototype.getAscColor;
CRoleSettings.prototype["asc_putColor"] = CRoleSettings.prototype.asc_putColor = CRoleSettings.prototype.setAscColor;
CRoleSettings.prototype["asc_getFieldCount"] = CRoleSettings.prototype.asc_getFieldCount = CRoleSettings.prototype.getFieldCount;
})(window);