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

для Bug 29859 - [Mail Merge] Ошибка конвертации при загрузке документа с данными адресатов

Browse Source 
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@64671 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Sergey.Konovalov
2015-09-11 15:05:18 +00:00
committed by Alexander.Trofimov
parent 1fa18590b2
commit 6475e2cd24
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Common/sources/commondefines.js
View File

@ -194,10 +194,10 @@ function CMailMergeSendData(obj) {
this['message'] = obj['message'];
this['recordFrom'] = obj['recordFrom'];
this['recordTo'] = obj['recordTo'];
this['recordToExec'] = obj['recordToExec'];
this['recordCount'] = obj['recordCount'];
this['userId'] = obj['userId'];
this['url'] = obj['url'];
this['baseUrl'] = obj['baseUrl'];
this['jsonkey'] = obj['jsonkey'];
} else {
this['from'] = null;
@ -211,6 +211,7 @@ function CMailMergeSendData(obj) {
this['recordCount'] = null;
this['userId'] = null;
this['url'] = null;
this['baseUrl'] = null;
this['jsonkey'] = null;
}
}