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

Убрал выставление режима просмотра (viewerMode). Ранее если был режим просмотра - это не считалось редактированием и не входило в рассчет числа пользователей для начала совместного редактирования.

Browse Source 
Теперь режим просмотра и редактирования равны в рассчете числа пользователей в документе.
Правки для бага http://bugzserver/show_bug.cgi?id=20545

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@50366 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Alexander.Trofimov
2013-10-02 14:21:37 +00:00
parent 8167a7e036
commit 4902c1ebf1
1 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
CoAuthoring/sources/DocsCoServer.js
View File

@ -307,8 +307,7 @@ exports.install = function (server, callbackFunction) {
return el.connection.docId === participant.connection.docId && el.connection.userId !== participant.connection.userId;
}).map(
function (conn) {
return {id: conn.connection.userId, username: conn.connection.userName,
isviewermode: conn.connection.isViewerMode};
return {id: conn.connection.userId, username: conn.connection.userName};
}).value()
});
@ -319,27 +318,6 @@ exports.install = function (server, callbackFunction) {
});
});
}
function sendParticipantsIsViewerMode(participants, isViewerMode, _userId, _userName) {
_.each(participants, function (participant) {
sendData(participant.connection, {type:"participants",
participants:_.chain(connections).filter(
function (el) {
return el.connection.docId === participant.connection.docId && el.connection.userId !== participant.connection.userId;
}).map(
function (conn) {
return {id: conn.connection.userId, username: conn.connection.userName,
isviewermode: conn.connection.isViewerMode};
}).value()
});
sendData(participant.connection, {type:"isviewermode",
isviewermode: isViewerMode,
id: _userId,
username: _userName
});
});
}
function getParticipants(docId, exludeuserId) {
return _.filter(connections, function (el) {
@ -524,7 +502,6 @@ exports.install = function (server, callbackFunction) {
conn.sessionState = 1;
conn.userId = data.user;
conn.userName = data.username;
conn.isViewerMode = data.isviewermode;
conn.serverHost = data.serverHost;
conn.serverPath = data.serverPath;
//Set the unique ID
@ -556,8 +533,7 @@ exports.install = function (server, callbackFunction) {
result:1,
sessionId:conn.sessionId,
participants:_.map(participants, function (conn) {
return {id: conn.connection.userId, username: conn.connection.userName,
isviewermode: conn.connection.isViewerMode};
return {id: conn.connection.userId, username: conn.connection.userName};
}),
messages:messages[data.docid],
locks:locks[conn.docId],
@ -589,7 +565,7 @@ exports.install = function (server, callbackFunction) {
}
function getlock(conn, data) {
var participants = getParticipants(conn.docId), documentLocks, currentLock;
var participants = getParticipants(conn.docId), documentLocks;
if (!locks.hasOwnProperty(conn.docId)) {
locks[conn.docId] = {};
}
@ -865,14 +841,6 @@ exports.install = function (server, callbackFunction) {
sendData(participant.connection, {type:"unsavelock"});
});
}
// Выставляем режим редактирования или просмотра
function setisviewermode(conn, data) {
if (data && conn.isViewerMode != data.isviewermode) {
conn.isViewerMode = data.isviewermode;
var participants = getParticipants(conn.docId);
sendParticipantsIsViewerMode (participants, conn.isViewerMode, conn.userId, conn.userName);
}
}
// Возвращаем все сообщения для документа
function getmessages(conn, data) {
sendData(conn, {type:"message", messages:messages[conn.docId]});
@ -885,8 +853,7 @@ exports.install = function (server, callbackFunction) {
{
type:"getusers",
participants:_.map(participants, function (conn) {
return {id: conn.connection.userId, username: conn.connection.userName,
isviewermode: conn.connection.isViewerMode};
return {id: conn.connection.userId, username: conn.connection.userName};
})
});
}
@ -900,7 +867,6 @@ exports.install = function (server, callbackFunction) {
savechanges:savechanges,
issavelock:issavelock,
unsavelock:unsavelock,
setisviewermode:setisviewermode,
getmessages:getmessages,
getusers:getusers
};