From 70b7267666b87d03fe503348cbb97ab763029d95 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Tue, 17 Jun 2014 14:54:34 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D1=87=D0=B8=D1=81=D0=BB?= =?UTF-8?q?=D0=BE=D0=BC=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D0=B5=D0=B9=20=D0=BD=D0=B0=20=D0=B0=D0=B2?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20waitAuth?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@56705 954022d7-b5bf-4e40-9824-e11837661b57 --- CoAuthoring/sources/DocsCoServer.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/CoAuthoring/sources/DocsCoServer.js b/CoAuthoring/sources/DocsCoServer.js index 02ef7125..acab086a 100644 --- a/CoAuthoring/sources/DocsCoServer.js +++ b/CoAuthoring/sources/DocsCoServer.js @@ -462,23 +462,25 @@ exports.install = function (server, callbackFunction) { participants = getParticipants(docId); } - var conn; + var connection; var participantsMap = _.map(participants, function (conn) { return {id: conn.connection.userId, username: conn.connection.userName, color: conn.connection.userColor};}); _.each(participants, function (participant) { - conn = participant.connection; - sendData(conn, { - type : "auth", - result : 1, - sessionId : conn.sessionId, - participants : participantsMap, - messages : messages[conn.docid], - locks : locks[conn.docId], - changes : objChanges[conn.docId], - indexUser : indexUser[conn.docId] - }); + connection = participant.connection; + if (userId !== connection.userId) { + sendData(connection, { + type: "auth", + result: 1, + sessionId: connection.sessionId, + participants: participantsMap, + messages: messages[connection.docid], + locks: locks[connection.docId], + changes: objChanges[connection.docId], + indexUser: indexUser[connection.docId] + }); + } }); result = true; @@ -1029,7 +1031,7 @@ exports.install = function (server, callbackFunction) { var participants = getParticipants(docId, userId); // Для данного пользователя снимаем Lock с документа - if (!checkEndAuthLock(docId, userId, participants)) { + if (!checkEndAuthLock(docId, userId)) { var arrLocks = _.map(userLocks, function (e) { return { block:e.block,