Commit a75b5882 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

add CMailMergeSendData.userId

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62419 954022d7-b5bf-4e40-9824-e11837661b57
parent 75b29efc
...@@ -327,6 +327,7 @@ function CMailMergeSendData (obj){ ...@@ -327,6 +327,7 @@ function CMailMergeSendData (obj){
this.message = null; this.message = null;
this.recordFrom = null; this.recordFrom = null;
this.recordTo = null; this.recordTo = null;
this.userId = null;
this.jsonKey = null; this.jsonKey = null;
} }
} }
...@@ -346,6 +347,8 @@ CMailMergeSendData.prototype.get_RecordFrom = function(){return this.recordFrom} ...@@ -346,6 +347,8 @@ CMailMergeSendData.prototype.get_RecordFrom = function(){return this.recordFrom}
CMailMergeSendData.prototype.put_RecordFrom = function(v){this.recordFrom = v;}; CMailMergeSendData.prototype.put_RecordFrom = function(v){this.recordFrom = v;};
CMailMergeSendData.prototype.get_RecordTo = function(){return this.recordTo}; CMailMergeSendData.prototype.get_RecordTo = function(){return this.recordTo};
CMailMergeSendData.prototype.put_RecordTo = function(v){this.recordTo = v;}; CMailMergeSendData.prototype.put_RecordTo = function(v){this.recordTo = v;};
CMailMergeSendData.prototype.get_UserId = function(){return this.userId};
CMailMergeSendData.prototype.put_UserId = function(v){this.userId = v;};
CMailMergeSendData.prototype.get_JsonKey = function(){return this.jsonKey}; CMailMergeSendData.prototype.get_JsonKey = function(){return this.jsonKey};
CMailMergeSendData.prototype.put_JsonKey = function(v){this.jsonKey = v;}; CMailMergeSendData.prototype.put_JsonKey = function(v){this.jsonKey = v;};
...@@ -1508,6 +1511,7 @@ asc_docs_api.prototype._coAuthoringInit = function() ...@@ -1508,6 +1511,7 @@ asc_docs_api.prototype._coAuthoringInit = function()
var oMailMergeSendData = t.mailMergeSendData; var oMailMergeSendData = t.mailMergeSendData;
t.mailMergeSendData = null; t.mailMergeSendData = null;
oMailMergeSendData.put_JsonKey(t.mailMergeFileKey); oMailMergeSendData.put_JsonKey(t.mailMergeFileKey);
oMailMergeSendData.put_UserId(documentUserId);
if(null != t.mailMergeSendTimeout) if(null != t.mailMergeSendTimeout)
clearTimeout(t.mailMergeSendTimeout); clearTimeout(t.mailMergeSendTimeout);
if(isSuccess){ if(isSuccess){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment