From be2a91962c13b629dfa6d6a7906669bc35192327 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Thu, 29 Oct 2015 11:00:43 +0000 Subject: [PATCH] =?UTF-8?q?fix=20bug=20#30669=20=D0=9E=D1=82=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D1=8F=D1=82=D1=8C=D1=81=D1=8F=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BB=D0=B6=D0=BD=D1=8B=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D0=B8,=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D1=83=D1=8E?= =?UTF-8?q?=D1=82.?= 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@65524 954022d7-b5bf-4e40-9824-e11837661b57 --- DocService/sources/DocsCoServer.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js index cdbd38d1..884588b5 100644 --- a/DocService/sources/DocsCoServer.js +++ b/DocService/sources/DocsCoServer.js @@ -404,9 +404,6 @@ function getParticipantUser(docId, includeUserId) { return el.docId === docId && el.user.id === includeUserId; }); } -function* getParticipantCount(docId) { - return yield utils.promiseRedis(redisClient, redisClient.hlen, redisKeyEditors + docId); -} function* hasEditors(docId) { var elem, hasEditors = false; var hRes = yield utils.promiseRedis(redisClient, redisClient.hvals, redisKeyEditors + docId); @@ -450,7 +447,9 @@ function* getOriginalParticipantsId(docId) { var hvalsRes = yield utils.promiseRedis(redisClient, redisClient.hvals, redisKeyEditors + docId); for (var i = 0; i < hvalsRes.length; ++i) { var elem = JSON.parse(hvalsRes[i]); - tmpObject[elem.idOriginal] = 1; + if (!elem.view) { + tmpObject[elem.idOriginal] = 1; + } } for (var name in tmpObject) if (tmpObject.hasOwnProperty(name)) { result.push(name); @@ -1850,9 +1849,7 @@ exports.install = function(server, callbackFunction) { case PublishType.releaseLock: participants = getParticipants(true, data.docId, data.userId, true); _.each(participants, function(participant) { - if (!participant.isViewer) { - sendReleaseLock(participant, data.locks); - } + sendReleaseLock(participant, data.locks); }); break; case PublishType.participantsState: