Commit 5d5ca862 authored by Alexey.Golubev's avatar Alexey.Golubev Committed by Alexander.Trofimov

При любой команде передаем идентификатор пользователя.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54232 954022d7-b5bf-4e40-9824-e11837661b57
parent dce30e8d
...@@ -55,6 +55,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -55,6 +55,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
this.DocumentName = ""; this.DocumentName = "";
this.documentId = undefined; this.documentId = undefined;
this.documentUserId = undefined;
this.documentUrl = "null"; this.documentUrl = "null";
this.documentTitle = "null"; this.documentTitle = "null";
this.documentTitleWithoutExtention = "null"; this.documentTitleWithoutExtention = "null";
...@@ -420,6 +421,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -420,6 +421,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
if(this.DocInfo){ if(this.DocInfo){
this.documentId = this.DocInfo["Id"]; this.documentId = this.DocInfo["Id"];
this.documentUserId = this.DocInfo["UserId"];
this.documentUrl = this.DocInfo["Url"]; this.documentUrl = this.DocInfo["Url"];
this.documentTitle = this.DocInfo["Title"]; this.documentTitle = this.DocInfo["Title"];
this.documentFormat = this.DocInfo["Format"]; this.documentFormat = this.DocInfo["Format"];
...@@ -527,6 +529,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -527,6 +529,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
var rdata = { var rdata = {
"c" : "getsettings", "c" : "getsettings",
"id" : this.DocInfo["Id"], "id" : this.DocInfo["Id"],
"userid" : this.DocInfo["UserId"],
"format" : this.DocInfo["Format"], "format" : this.DocInfo["Format"],
"vkey" : this.DocInfo["VKey"], "vkey" : this.DocInfo["VKey"],
"editorid" : c_oEditorId.Speadsheet "editorid" : c_oEditorId.Speadsheet
...@@ -540,7 +543,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -540,7 +543,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
asc_getLicense : function () { asc_getLicense : function () {
var t = this; var t = this;
var rdata = { var rdata = {
"c" : "getlicense" "c": "getlicense",
"id": this.DocInfo["Id"],
"userid": this.DocInfo["UserId"]
}; };
this._asc_sendCommand(function (response) {t._onGetLicense(response);}, rdata); this._asc_sendCommand(function (response) {t._onGetLicense(response);}, rdata);
}, },
...@@ -749,7 +754,19 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -749,7 +754,19 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
if (this.advancedOptionsAction === c_oAscAdvancedOptionsAction.Open) { if (this.advancedOptionsAction === c_oAscAdvancedOptionsAction.Open) {
this.documentFormatSaveCsvCodepage = option.asc_getCodePage(); this.documentFormatSaveCsvCodepage = option.asc_getCodePage();
this.documentFormatSaveCsvDelimiter = option.asc_getDelimiter(); this.documentFormatSaveCsvDelimiter = option.asc_getDelimiter();
var v = {"id":this.documentId, "format": this.documentFormat, "vkey": this.documentVKey, "editorid": c_oEditorId.Speadsheet, "c":"reopen", "url": this.documentUrl, "title": this.documentTitle, "embeddedfonts": this.isUseEmbeddedCutFonts, "delimiter": option.asc_getDelimiter(), "codepage": option.asc_getCodePage()}; var v = {
"id":this.documentId,
"userid": this.documentUserId,
"format": this.documentFormat,
"vkey": this.documentVKey,
"editorid": c_oEditorId.Speadsheet,
"c":"reopen",
"url": this.documentUrl,
"title": this.documentTitle,
"embeddedfonts": this.isUseEmbeddedCutFonts,
"delimiter": option.asc_getDelimiter(),
"codepage": option.asc_getCodePage()};
this._asc_sendCommand(function (response) {t._startOpenDocument(response);}, v); this._asc_sendCommand(function (response) {t._startOpenDocument(response);}, v);
} else if (this.advancedOptionsAction === c_oAscAdvancedOptionsAction.Save) } else if (this.advancedOptionsAction === c_oAscAdvancedOptionsAction.Save)
this._asc_downloadAs(c_oAscFileType.CSV, function(incomeObject){ this._asc_downloadAs(c_oAscFileType.CSV, function(incomeObject){
...@@ -902,11 +919,25 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -902,11 +919,25 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
callback(incomeObject); callback(incomeObject);
break; break;
case "waitopen": case "waitopen":
var rData = {"id":oThis.documentId, "format": oThis.documentFormat, "vkey": oThis.documentVKey, "editorid": c_oEditorId.Spreadsheet, "c":"chopen"}; var rData = {
"id":oThis.documentId,
"userid": oThis.documentUserId,
"format": oThis.documentFormat,
"vkey": oThis.documentVKey,
"editorid": c_oEditorId.Spreadsheet,
"c":"chopen"};
setTimeout(function(){oThis._asc_sendCommand(callback, rData);}, 3000); setTimeout(function(){oThis._asc_sendCommand(callback, rData);}, 3000);
break; break;
case "waitsave": case "waitsave":
var rData = {"id": oThis.documentId, "vkey": oThis.documentVKey, "title": oThis.documentTitleWithoutExtention, "c": "chsave", "data": incomeObject["data"]}; var rData = {
"id": oThis.documentId,
"userid": oThis.documentUserId,
"vkey": oThis.documentVKey,
"title": oThis.documentTitleWithoutExtention,
"c": "chsave",
"data": incomeObject["data"]};
setTimeout(function(){oThis._asc_sendCommand(callback, rData);}, 3000); setTimeout(function(){oThis._asc_sendCommand(callback, rData);}, 3000);
break; break;
case "savepart": case "savepart":
...@@ -988,6 +1019,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -988,6 +1019,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
} else { } else {
var v = { var v = {
"id" : this.documentId, "id" : this.documentId,
"userid" : this.documentUserId,
"format" : this.documentFormat, "format" : this.documentFormat,
"vkey" : this.documentVKey, "vkey" : this.documentVKey,
"editorid" : c_oEditorId.Speadsheet, "editorid" : c_oEditorId.Speadsheet,
...@@ -1019,6 +1051,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1019,6 +1051,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
var oAdditionalData = {}; var oAdditionalData = {};
oAdditionalData["c"] = "save"; oAdditionalData["c"] = "save";
oAdditionalData["id"] = this.documentId; oAdditionalData["id"] = this.documentId;
oAdditionalData["userid"] = this.documentUserId,
oAdditionalData["vkey"] = this.documentVKey; oAdditionalData["vkey"] = this.documentVKey;
oAdditionalData["outputformat"] = this.documentFormatSave; oAdditionalData["outputformat"] = this.documentFormatSave;
if(c_oAscFileType.CSV == this.documentFormatSave) if(c_oAscFileType.CSV == this.documentFormatSave)
...@@ -1040,6 +1073,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1040,6 +1073,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
var oAdditionalData = {}; var oAdditionalData = {};
oAdditionalData["c"] = "save"; oAdditionalData["c"] = "save";
oAdditionalData["id"] = this.documentId; oAdditionalData["id"] = this.documentId;
oAdditionalData["userid"] = this.documentUserId,
oAdditionalData["vkey"] = this.documentVKey; oAdditionalData["vkey"] = this.documentVKey;
oAdditionalData["outputformat"] = sFormat; oAdditionalData["outputformat"] = sFormat;
if(null != sSaveKey) if(null != sSaveKey)
...@@ -1079,7 +1113,12 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1079,7 +1113,12 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
} }
} }
} else if (c_oAscFileType.CSV === sFormat && !options) { } else if (c_oAscFileType.CSV === sFormat && !options) {
var v = {"id":this.documentId, "vkey": this.documentVKey, "c":"getcodepage"}; var v = {
"id":this.documentId,
"userid": this.documentUserId,
"vkey": this.documentVKey,
"c":"getcodepage"};
return this._asc_sendCommand (fCallback, v); return this._asc_sendCommand (fCallback, v);
} else { } else {
this.wb._initCommentsToSave(); this.wb._initCommentsToSave();
...@@ -2384,7 +2423,13 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2384,7 +2423,13 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
}, },
asc_addImageDrawingObject: function(imageUrl) { asc_addImageDrawingObject: function(imageUrl) {
var rData = {"id":this.documentId, "vkey": this.documentVKey, "c":"imgurl", "data": imageUrl}; var rData = {
"id":this.documentId,
"userid":this.documentUserId,
"vkey": this.documentVKey,
"c":"imgurl",
"data": imageUrl};
var oThis = this; var oThis = this;
this.handlers.trigger("asc_onStartAction", c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage); this.handlers.trigger("asc_onStartAction", c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
this._asc_sendCommand( function(incomeObject){ this._asc_sendCommand( function(incomeObject){
......
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